i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify cookie string-ification code.

Browse Source
This commit is contained in:
Adrien Destugues
2014-01-13 09:05:19 +01:00
parent aa5101ce5c
commit b3cc244542
1 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/network/libnetapi/NetworkCookie.cpp
+27 -24
View File
@@ -39,11 +39,11 @@ BNetworkCookie::BNetworkCookie(const char* name, const char* value,
SetDomain(url.Host()); SetDomain(url.Host());
if(url.Protocol() == "file" && url.Host().Length() == 0) if (url.Protocol() == "file" && url.Host().Length() == 0)
{ {
SetDomain("localhost"); SetDomain("localhost");
// make sure cookies set from a file:// URL are stored somewhere. // make sure cookies set from a file:// URL are stored somewhere.
} }
SetPath(_DefaultPathForUrl(url)); SetPath(_DefaultPathForUrl(url));
} }
@@ -100,13 +100,13 @@ BNetworkCookie::ParseCookieString(const BString& string, const BUrl& url)
SetPath(_DefaultPathForUrl(url)); SetPath(_DefaultPathForUrl(url));
SetDomain(url.Host()); SetDomain(url.Host());
fHostOnly = true; fHostOnly = true;
if(url.Protocol() == "file" && url.Host().Length() == 0) if (url.Protocol() == "file" && url.Host().Length() == 0)
{ {
fDomain = "localhost"; fDomain = "localhost";
// make sure cookies set from a file:// URL are stored somewhere. // make sure cookies set from a file:// URL are stored somewhere.
// not going through SetDomain as it requires at least one '.' // not going through SetDomain as it requires at least one '.'
// in the domain (to avoid setting cookies on TLDs). // in the domain (to avoid setting cookies on TLDs).
} }
BString name; BString name;
BString value; BString value;
@@ -378,11 +378,19 @@ BNetworkCookie::HttpOnly() const
const BString& const BString&
BNetworkCookie::RawCookie(bool full) const BNetworkCookie::RawCookie(bool full) const
{ {
if (full && !fRawFullCookieValid) { if (!fRawCookieValid) {
fRawFullCookie.Truncate(0); fRawCookie.Truncate(0);
fRawFullCookieValid = true; fRawCookieValid = true;
fRawFullCookie << fName << "=" << fValue; fRawCookie << fName << "=" << fValue;
}
if (!full)
return fRawCookie;
if (!fRawFullCookieValid) {
fRawFullCookie = fRawCookie;
fRawFullCookieValid = true;
if (HasDomain()) if (HasDomain())
fRawFullCookie << "; Domain=" << fDomain; fRawFullCookie << "; Domain=" << fDomain;
@@ -395,14 +403,9 @@ BNetworkCookie::RawCookie(bool full) const
if (HttpOnly()) if (HttpOnly())
fRawFullCookie << "; HttpOnly"; fRawFullCookie << "; HttpOnly";
} else if (!full && !fRawCookieValid) {
fRawCookie.Truncate(0);
fRawCookieValid = true;
fRawCookie << fName << "=" << fValue;
} }
return full ? fRawFullCookie : fRawCookie; return fRawFullCookie;
} }
@@ -436,8 +439,8 @@ BNetworkCookie::IsValidForUrl(const BUrl& url) const
if (Secure() && url.Protocol() != "https") if (Secure() && url.Protocol() != "https")
return false; return false;
if (url.Protocol() == "file") if (url.Protocol() == "file")
return Domain() == "localhost" && IsValidForPath(url.Path()); return Domain() == "localhost" && IsValidForPath(url.Path());
return IsValidForDomain(url.Host()) && IsValidForPath(url.Path()); return IsValidForDomain(url.Host()) && IsValidForPath(url.Path());
} }