Skip to content
Permalink
Browse files

Revert "cookies: extend domain checks to non psl builds"

This reverts commit 3773de3.

Regression shipped in 7.64.0
Fixes #3649
  • Loading branch information...
bagder committed Mar 8, 2019
1 parent 76b6348 commit 299d9660f85b7dbc1613931b35e0c5cdf856bf44
Showing with 5 additions and 9 deletions.
  1. +5 −8 lib/cookie.c
  2. +0 −1 tests/data/test8
@@ -816,8 +816,6 @@ Curl_cookie_add(struct Curl_easy *data,
co->domain = strdup(ptr);
if(!co->domain)
badcookie = TRUE;
else if(bad_domain(co->domain))
badcookie = TRUE;
break;
case 1:
/* This field got its explanation on the 23rd of May 2001 by
@@ -946,20 +944,18 @@ Curl_cookie_add(struct Curl_easy *data,
if(!noexpire)
remove_expired(c);

if(domain && co->domain && !isip(co->domain)) {
int acceptable;
#ifdef USE_LIBPSL
/* Check if the domain is a Public Suffix and if yes, ignore the cookie. */
if(domain && co->domain && !isip(co->domain)) {
const psl_ctx_t *psl = Curl_psl_use(data);
int acceptable;

/* Check if the domain is a Public Suffix and if yes, ignore the cookie. */
if(psl) {
acceptable = psl_is_cookie_domain_acceptable(psl, domain, co->domain);
Curl_psl_release(data);
}
else
#endif
/* Without libpsl, do the best we can. */
acceptable = !bad_domain(co->domain);
acceptable = !bad_domain(domain);

if(!acceptable) {
infof(data, "cookie '%s' dropped, domain '%s' must not "
@@ -968,6 +964,7 @@ Curl_cookie_add(struct Curl_easy *data,
return NULL;
}
}
#endif

myhash = cookiehash(co->domain);
clist = c->cookies[myhash];
@@ -46,7 +46,6 @@ Set-Cookie: trailingspace = removed; path=/we/want;
Set-Cookie: nocookie=yes; path=/WE;
Set-Cookie: blexp=yesyes; domain=%HOSTIP; domain=%HOSTIP; expiry=totally bad;
Set-Cookie: partialip=nono; domain=.0.0.1;
Set-Cookie: chocolate=chip; domain=curl; path=/we/want;

</file>
<precheck>

0 comments on commit 299d966

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.