Commit c0b9dd27 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

HTTP time condition: force closure for 200 OK 

When a time condition isn't met, so that no body is delivered to the
application even though a 2xx response is being read from the server, we
must close the connection to avoid a re-use of the connection to be
completely tricked.

Added test 1128 to verify.
parent 6aff8059

lib/transfer.c

+3 −0
Original line number Diff line number Diff line
@@ -563,6 +563,9 @@ static CURLcode readwrite_data(struct SessionHandle *data, 


            if(!Curl_meets_timecondition(data, k->timeofdoc)) {

              *done = TRUE;

              /* we abort the transfer before it is completed == we ruin the

                 re-use ability. Close the connection */

              conn->bits.close = TRUE;

              return CURLE_OK;

            }

          } /* we have a time condition */

tests/data/Makefile.am

+3 −3
Original line number Diff line number Diff line
@@ -71,9 +71,9 @@ test1094 test1095 test1096 test1097 test1098 test1099 test1100 test1101 \ 
test1102 test1103 test1104 test1105 test1106 test1107 test1108 test1109	\

test1110 test1111 test1112 test1113 test1114 test1115 test1116 test1117	\

test1118 test1119 test1120 test1121 test1122 test1123 test1124 test1125	\

test1126 test1127 test1200 test1201 test1202 test1203 test1300 test1301	\

test1302 test1303 test1304 test1305 test1306 test1307 test2000 test2001	\

test2002 test2003 test2004

test1126 test1127 test1128 test1200 test1201 test1202 test1203 test1300	\

test1301 test1302 test1303 test1304 test1305 test1306 test1307 test2000	\

test2001 test2002 test2003 test2004



EXTRA_DIST = $(TESTCASES) DISABLED

tests/data/test1128

0 → 100644
+85 −0
Original line number Diff line number Diff line 
<testcase>

<info>

<keywords>

HTTP

HTTP GET

If-Modified-Since

</keywords>

</info>

#

# Server-side

<reply>

<data nocheck="yes">

HTTP/1.1 200 OK

Date: Thu, 09 Nov 2010 14:49:00 GMT

Server: test-server/fake

Last-Modified: Tue, 13 Jun 1980 12:10:00 GMT

Content-Length: 11

Content-Type: text/html



0123456789

</data>

<data1>

HTTP/1.1 200 OK

Date: Thu, 09 Nov 2010 14:49:01 GMT

Server: test-server/fake

Last-Modified: Tue, 13 Jun 2002 12:10:00 GMT

Content-Length: 11

Content-Type: text/html



0123456789

</data1>

</reply>



#

# Client-side

<client>

<server>

http

</server>

 <name>

HTTP 200 If-Modified-Since with old+new documents

 </name>

 <command>

http://%HOSTIP:%HTTPPORT/1128 http://%HOSTIP:%HTTPPORT/11280001 -z "dec 12 12:00:00 1999 GMT"

</command>

</client>



#

# Verify data after the test has been "shot"

<verify>

<strip>

^User-Agent:.*

</strip>

<protocol>

GET /1128 HTTP/1.1

Host: %HOSTIP:%HTTPPORT

Accept: */*

If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT



GET /11280001 HTTP/1.1

Host: %HOSTIP:%HTTPPORT

Accept: */*

If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT



</protocol>



<stdout>

HTTP/1.1 200 OK

Date: Thu, 09 Nov 2010 14:49:00 GMT

Server: test-server/fake

Last-Modified: Tue, 13 Jun 1980 12:10:00 GMT

Content-Length: 11

Content-Type: text/html



HTTP/1.1 200 OK

Date: Thu, 09 Nov 2010 14:49:01 GMT

Server: test-server/fake

Last-Modified: Tue, 13 Jun 2002 12:10:00 GMT

Content-Length: 11

Content-Type: text/html



0123456789

</stdout>

</verify>

</testcase>