Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-13 19:51:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复FullUrl()未url转义导致的bug

Browse Source
This commit is contained in:
ziyue
2021-08-26 19:10:04 +08:00
parent 626bf3dcf9
commit 03e9c09c42
4 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Common/Parser.cpp
View File

@@ -49,16 +49,16 @@ void Parser::Parse(const char *buf) {
}
if (start == buf) {
_strMethod = FindField(line.data(), NULL, " ");
_strFullUrl = FindField(line.data(), " ", " ");
auto args_pos = _strFullUrl.find('?');
auto strFullUrl = FindField(line.data(), " ", " ");
auto args_pos = strFullUrl.find('?');
if (args_pos != string::npos) {
_strUrl = _strFullUrl.substr(0, args_pos);
_params = _strFullUrl.substr(args_pos + 1);
_strUrl = strFullUrl.substr(0, args_pos);
_params = strFullUrl.substr(args_pos + 1);
_mapUrlArgs = parseArgs(_params);
} else {
_strUrl = _strFullUrl;
_strUrl = strFullUrl;
}
_strTail = FindField(line.data(), (_strFullUrl + " ").data(), NULL);
_strTail = FindField(line.data(), (strFullUrl + " ").data(), NULL);
} else {
auto field = FindField(line.data(), NULL, ": ");
auto value = FindField(line.data(), ": ", NULL);
@@ -82,8 +82,11 @@ const string &Parser::Url() const {
return _strUrl;
}
const string &Parser::FullUrl() const {
return _strFullUrl;
string Parser::FullUrl() const {
if (_params.empty()) {
return _strUrl;
}
return _strUrl + "?" + _params;
}
const string &Parser::Tail() const {
@@ -105,7 +108,6 @@ const string &Parser::Content() const {
void Parser::Clear() {
_strMethod.clear();
_strUrl.clear();
_strFullUrl.clear();
_params.clear();
_strTail.clear();
_strContent.clear();

3
src/Common/Parser.h
View File

@@ -69,7 +69,7 @@ public:
//获取中间url，不包含?后面的参数
const string &Url() const;
//获取中间url，包含?后面的参数
const string &FullUrl() const;
string FullUrl() const;
//获取命令协议名
const string &Tail() const;
//根据header key名，获取请求header value值
@@ -96,7 +96,6 @@ private:
string _strTail;
string _strContent;
string _strNull;
string _strFullUrl;
string _params;
mutable StrCaseMap _mapHeaders;
mutable StrCaseMap _mapUrlArgs;