Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit

This commit is contained in:
xiongziliang 2021-12-17 22:40:42 +08:00
commit ee13ca57c2

View File

@ -9,6 +9,7 @@
*/ */
#include <cstdlib> #include <cstdlib>
#include "Util/base64.h"
#include "HttpClient.h" #include "HttpClient.h"
#include "Common/config.h" #include "Common/config.h"
@ -39,6 +40,13 @@ void HttpClient::sendRequest(const string &strUrl, float fTimeOutSec) {
if (_path.empty()) { if (_path.empty()) {
_path = "/"; _path = "/";
} }
auto pos = host.find('@');
if (pos != string::npos) {
//去除?后面的字符串
auto authStr = host.substr(0, pos);
host = host.substr(pos + 1, host.size());
_header.emplace("Authorization", "Basic " + encodeBase64(authStr));
}
auto host_header = host; auto host_header = host;
uint16_t port = atoi(FindField(host.data(), ":", NULL).data()); uint16_t port = atoi(FindField(host.data(), ":", NULL).data());
if (port <= 0) { if (port <= 0) {