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

Fix sending and receiving cookies

Browse source
This commit is contained in:
Nimetu 2015-04-20 20:51:00 +03:00
parent 61af82194c
commit 68db74603b
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -416,6 +416,8 @@ namespace NLGUI
} }
else else
{ {
receiveCookies(_CurlWWW->Request, HTTPCurrentDomain, _TrustedDomain);
// redirect, get the location and try browse again // redirect, get the location and try browse again
// we cant use curl redirection because 'addHTTPGetParams()' must be called on new destination // we cant use curl redirection because 'addHTTPGetParams()' must be called on new destination
std::string location(_CurlWWW->getLocationHeader()); std::string location(_CurlWWW->getLocationHeader());
@ -441,6 +443,8 @@ namespace NLGUI
} }
else else
{ {
receiveCookies(_CurlWWW->Request, HTTPCurrentDomain, _TrustedDomain);
_RedirectsRemaining = DEFAULT_RYZOM_REDIRECT_LIMIT; _RedirectsRemaining = DEFAULT_RYZOM_REDIRECT_LIMIT;
if ( (code < 200 || code >= 300) ) if ( (code < 200 || code >= 300) )
@ -449,8 +453,6 @@ namespace NLGUI
} }
else else
{ {
receiveCookies(_CurlWWW->Request, HTTPCurrentDomain, _TrustedDomain);
char *ch; char *ch;
std::string contentType; std::string contentType;
res = curl_easy_getinfo(_CurlWWW->Request, CURLINFO_CONTENT_TYPE, &ch); res = curl_easy_getinfo(_CurlWWW->Request, CURLINFO_CONTENT_TYPE, &ch);

3
code/nel/src/gui/libwww.cpp
View file

@ -387,6 +387,9 @@ namespace NLGUI
// add all cookies for domain to curl handle // add all cookies for domain to curl handle
void sendCookies(CURL *curl, const std::string &domain, bool trusted) void sendCookies(CURL *curl, const std::string &domain, bool trusted)
{ {
// enable curl cookie engine
curl_easy_setopt(curl, CURLOPT_COOKIELIST, "");
if (domain.empty()) if (domain.empty())
return; return;