mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2024-11-22 18:50:20 +08:00
Fix addStreamProxy rtsp url user or pass contain special char result in auth failed (#2545)
This commit is contained in:
parent
24fb666fb3
commit
67d5c42007
@ -10,6 +10,7 @@
|
||||
|
||||
#include <cinttypes>
|
||||
#include "Parser.h"
|
||||
#include "strCoding.h"
|
||||
#include "macros.h"
|
||||
#include "Network/sockutil.h"
|
||||
#include "Common/macros.h"
|
||||
@ -287,9 +288,10 @@ void RtspUrl::setup(bool is_ssl, const string &url, const string &user, const st
|
||||
uint16_t port = is_ssl ? 322 : 554;
|
||||
splitUrl(ip, ip, port);
|
||||
|
||||
|
||||
_url = std::move(url);
|
||||
_user = std::move(user);
|
||||
_passwd = std::move(passwd);
|
||||
_user = strCoding::UrlDecode(std::move(user));
|
||||
_passwd = strCoding::UrlDecode(std::move(passwd));
|
||||
_host = std::move(ip);
|
||||
_port = port;
|
||||
_is_ssl = is_ssl;
|
||||
|
@ -22,7 +22,7 @@
|
||||
#include "HttpRequestSplitter.h"
|
||||
#include "HttpCookie.h"
|
||||
#include "HttpChunkedSplitter.h"
|
||||
#include "strCoding.h"
|
||||
#include "Common/strCoding.h"
|
||||
#include "HttpBody.h"
|
||||
|
||||
namespace mediakit {
|
||||
|
@ -20,7 +20,7 @@
|
||||
#include "Record/HlsMediaSource.h"
|
||||
#include "Common/Parser.h"
|
||||
#include "Common/config.h"
|
||||
#include "strCoding.h"
|
||||
#include "Common/strCoding.h"
|
||||
|
||||
using namespace std;
|
||||
using namespace toolkit;
|
||||
|
@ -12,7 +12,7 @@
|
||||
#include <sys/stat.h>
|
||||
#include <algorithm>
|
||||
#include "Common/config.h"
|
||||
#include "strCoding.h"
|
||||
#include "Common/strCoding.h"
|
||||
#include "HttpSession.h"
|
||||
#include "HttpConst.h"
|
||||
#include "Util/base64.h"
|
||||
|
Loading…
Reference in New Issue
Block a user