summaryrefslogtreecommitdiff
path: root/lib/cookie.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2019-01-09 10:11:58 +0100
committerDaniel Stenberg <daniel@haxx.se>2019-01-10 10:31:06 +0100
commitafeb8d99022255279ee63125f2fa0f69810ce9c3 (patch)
treebfb795c8cab8f4e6357ce46e9144132e160e5e84 /lib/cookie.c
parent4c35574bb785ce44d72db5483541c9da2d885705 (diff)
downloadcurl-afeb8d99022255279ee63125f2fa0f69810ce9c3.tar.gz
cookies: allow secure override when done over HTTPS
Added test 1562 to verify. Reported-by: Jeroen Ooms Fixes #3445 Closes #3450
Diffstat (limited to 'lib/cookie.c')
-rw-r--r--lib/cookie.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/cookie.c b/lib/cookie.c
index f52c30840..dfa66ee7f 100644
--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -951,7 +951,7 @@ Curl_cookie_add(struct Curl_easy *data,
/* the domains were identical */
if(clist->spath && co->spath) {
- if(clist->secure && !co->secure) {
+ if(clist->secure && !co->secure && !secure) {
size_t cllen;
const char *sep;