Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
Nimetu 2017-05-04 10:35:43 +03:00
commit bb3b7e8277
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/nel/src/gui/group_html.cpp
View file

@ -376,7 +376,9 @@ namespace NLGUI
std::string userAgent = options.appName + "/" + options.appVersion; std::string userAgent = options.appName + "/" + options.appVersion;
curl_easy_setopt(curl, CURLOPT_USERAGENT, userAgent.c_str()); curl_easy_setopt(curl, CURLOPT_USERAGENT, userAgent.c_str());
sendCookies(curl, _DocumentDomain, _TrustedDomain); CUrlParser uri(download.url);
if (!uri.host.empty())
sendCookies(curl, uri.host, isTrustedDomain(uri.host));
curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp); curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite);
@ -638,7 +640,9 @@ namespace NLGUI
curl_easy_getinfo(it->data->Request, CURLINFO_RESPONSE_CODE, &r); curl_easy_getinfo(it->data->Request, CURLINFO_RESPONSE_CODE, &r);
fclose(it->fp); fclose(it->fp);
receiveCookies(it->data->Request, _DocumentDomain, _TrustedDomain); CUrlParser uri(it->url);
if (!uri.host.empty())
receiveCookies(it->data->Request, uri.host, isTrustedDomain(uri.host));
#ifdef LOG_DL #ifdef LOG_DL
nlwarning("(%s) transfer '%p' completed with status %d, http %d, url (len %d) '%s'", _Id.c_str(), it->data->Request, res, r, it->url.size(), it->url.c_str()); nlwarning("(%s) transfer '%p' completed with status %d, http %d, url (len %d) '%s'", _Id.c_str(), it->data->Request, res, r, it->url.size(), it->url.c_str());
#endif #endif