taixingyiji/subconverter
1
0 Fork 0
mirror of https://github.com/asdlokj1qpi233/subconverter.git synced 2026-11-04 02:34:06 +00:00
Code Issues Projects Releases Wiki Activity

Fix User-Agent header not being correctly sent while fetching files

Browse Source
This commit is contained in:
Tindy X committed 2020-06-29 00:12:24 +08:00
1 parent 0bfed74e1f
commit 8ad8048345
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
src/webget.cpp
+4 -4
View File
@@ -104,7 +104,10 @@ static int curlGet(const FetchArgument argument, FetchResult &result)
if(argument.request_headers) if(argument.request_headers)
{ {
for(auto &x : *argument.request_headers) for(auto &x : *argument.request_headers)
list = curl_slist_append(list, (x.first + ": " + x.second).data()); {
if(toLower(x.first) != "user-agent")
list = curl_slist_append(list, (x.first + ": " + x.second).data());
}
} }
if(list) if(list)
curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, list); curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, list);
@@ -252,7 +255,6 @@ int curlPost(const std::string &url, const std::string &data, const std::string
curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, writer); curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, writer);
curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, retData); curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, retData);
curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, list); curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, list);
curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, user_agent_str.data());
if(proxy.size()) if(proxy.size())
curl_easy_setopt(curl_handle, CURLOPT_PROXY, proxy.data()); curl_easy_setopt(curl_handle, CURLOPT_PROXY, proxy.data());
@@ -296,7 +298,6 @@ int curlPatch(const std::string &url, const std::string &data, const std::string
curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, writer); curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, writer);
curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, retData); curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, retData);
curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, list); curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, list);
curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, user_agent_str.data());
if(proxy.size()) if(proxy.size())
curl_easy_setopt(curl_handle, CURLOPT_PROXY, proxy.data()); curl_easy_setopt(curl_handle, CURLOPT_PROXY, proxy.data());
@@ -337,7 +338,6 @@ int curlHead(const std::string &url, const std::string &proxy, const string_arra
curl_easy_setopt(curl_handle, CURLOPT_HEADERDATA, &response_headers); curl_easy_setopt(curl_handle, CURLOPT_HEADERDATA, &response_headers);
curl_easy_setopt(curl_handle, CURLOPT_NOBODY, 1L); curl_easy_setopt(curl_handle, CURLOPT_NOBODY, 1L);
curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, list); curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, list);
curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, user_agent_str.data());
if(proxy.size()) if(proxy.size())
curl_easy_setopt(curl_handle, CURLOPT_PROXY, proxy.data()); curl_easy_setopt(curl_handle, CURLOPT_PROXY, proxy.data());