diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2019-03-08 16:55:27 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2019-03-09 12:59:20 +0100 |
| commit | 299d9660f85b7dbc1613931b35e0c5cdf856bf44 (patch) | |
| tree | 56a023245358d2dd3e3c82e290d0d4798d0b532b | |
| parent | 76b63489495ee1d49182a20525d7e6629cbab493 (diff) | |
Revert "cookies: extend domain checks to non psl builds"
This reverts commit 3773de378d48b06c09931e44dca4d274d0bfdce0.
Regression shipped in 7.64.0
Fixes #3649
| -rw-r--r-- | lib/cookie.c | 13 | ||||
| -rw-r--r-- | tests/data/test8 | 1 |
2 files changed, 5 insertions, 9 deletions
diff --git a/lib/cookie.c b/lib/cookie.c index b24aaf718..44851a52f 100644 --- a/lib/cookie.c +++ b/lib/cookie.c @@ -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]; diff --git a/tests/data/test8 b/tests/data/test8 index e6d0f500e..2fc190060 100644 --- a/tests/data/test8 +++ b/tests/data/test8 @@ -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> |