Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cookies: expire "Max-Age=0" immediately #3352

Closed
wants to merge 2 commits into from
Closed

cookies: expire "Max-Age=0" immediately #3352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3fdeca
cookies: expire "Max-Age=0" immediately
bagder Dec 8, 2018
93067c1
test329: verify cookie max-age=0 immediate expiry
bagder Dec 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/cookie.c
View file
Open in desktop
Expand Up @@ -675,7 +675,10 @@ Curl_cookie_add(struct Curl_easy *data,
/* overflow, used max value */
co->expires = CURL_OFF_T_MAX;
else if(!offt) {
if(CURL_OFF_T_MAX - now < co->expires)
if(!co->expires)
/* already expired */
co->expires = 1;
else if(CURL_OFF_T_MAX - now < co->expires)
/* would overflow */
co->expires = CURL_OFF_T_MAX;
else
Expand Down
2 changes: 1 addition & 1 deletion tests/data/Makefile.inc
View file
Open in desktop
Expand Up @@ -56,7 +56,7 @@ test289 test290 test291 test292 test293 test294 test295 test296 test297 \
test298 test299 test300 test301 test302 test303 test304 test305 test306 \
test307 test308 test309 test310 test311 test312 test313 test314 test315 \
test316 test317 test318 test319 test320 test321 test322 test323 test324 \
test325 test326 test327 test328 \
test325 test326 test327 test328 test329 \
\
test340 \
\
Expand Down
70 changes: 70 additions & 0 deletions tests/data/test329
View file
Open in desktop
@@ -0,0 +1,70 @@
<testcase>
<info>
<keywords>
HTTP
HTTP GET
cookies
</keywords>
</info>
# Server-side
<reply>
<data>
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
Content-Type: text/html
Funny-head: yesyes
Set-Cookie: test=yes; path=/we/want/; domain=.host.foo.com; Max-Age=0;
Content-Length: 4

boo
</data>
<data2>
HTTP/1.1 200 OK
Funny-head: yesyes
Content-Length: 4

moo
</data2>
</reply>

# Client-side
<client>
<file name="log/jar329.txt" mode="text">
.host.foo.com TRUE /we/want/ FALSE 2054030187 test no
</file>
<server>
http
</server>
<name>
HTTP cookie with Max-Age=0
</name>
# Explicitly set the time zone to a known good one, in case the user is
# using one of the 'right' zones that take into account leap seconds
# which causes the cookie expiry times to be different.
<setenv>
TZ=GMT
</setenv>
<command>
http://%HOSTIP:%HTTPPORT/we/want/329 -b log/jar329.txt -H "Host: host.foo.com" http://%HOSTIP:%HTTPPORT/we/want/3290002
</command>
</client>

# Verify data after the test has been "shot"
<verify>
<strip>
^User-Agent:.*
</strip>
<protocol>
GET /we/want/329 HTTP/1.1
Host: host.foo.com
Accept: */*
Cookie: test=no

GET /we/want/3290002 HTTP/1.1
Host: host.foo.com
Accept: */*

</protocol>
</verify>
</testcase>