curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-17 01:22:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

headers: reset the requests counter at transfer start

Browse Source 
If not, reusing an easy handle to do a subsequent transfer would
continue the counter from the previous invoke, which then would make use
of the header API difficult/impossible as the request counter
mismatched.

Add libtest 1947 to verify.

Reported-by: Andrew Lambert
Fixes #9424
Closes #9447
This commit is contained in:
Daniel Stenberg 2022-09-07 09:51:51 +02:00
parent 9c822a9994
commit 9c9e83931e
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
5 changed files with 167 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/transfer.c
View File

@ -1439,6 +1439,7 @@ CURLcode Curl_pretransfer(struct Curl_easy *data)
if(result)
return result;
data->state.requests = 0;
data->state.followlocation = 0; /* reset the location-follow counter */
data->state.this_is_a_follow = FALSE; /* reset this */
data->state.errorbuf = FALSE; /* no error has occurred */

2
tests/data/Makefile.inc
View File

@ -224,7 +224,7 @@ test1908 test1909 test1910 test1911 test1912 test1913 test1914 test1915 \
test1916 test1917 test1918 test1919 \
\
test1933 test1934 test1935 test1936 test1937 test1938 test1939 test1940 \
test1941 test1942 test1943 test1944 test1945 test1946 \
test1941 test1942 test1943 test1944 test1945 test1946 test1947 \
\
test2000 test2001 test2002 test2003 test2004 \
\

71
tests/data/test1947 Normal file
View File

@ -0,0 +1,71 @@
<testcase>
<info>
<keywords>
curl_easy_nextheader
</keywords>
</info>
# Server-side
<reply>
<data nocheck="yes">
HTTP/1.1 302 OK
Date: Thu, 01 Nov 2001 14:49:00 GMT
Server: test with trailing space
Content-Type: text/html
Content-Length: 0
Set-Cookie: onecookie=data;
Set-Cookie: secondcookie=2data;
Set-Cookie: cookie3=data3;
Location: /%TESTNUMBER0002
</data>
<data2 nocheck="yes">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: the other one
Content-Type: text/html
Content-Length: 0
Set-Cookie: 1cookie=data1;
Set-Cookie: 2cookie=data2;
</data2>
<data3 nocheck="yes">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: the other one
Content-Type: text/html
Content-Length: 0
</data3>
</reply>
# Client-side
<client>
<features>
headers-api
</features>
<server>
http
</server>
<name>
curl_easy_nextheader on second request after first did redirects
</name>
<tool>
lib%TESTNUMBER
</tool>
<command>
http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0003
</command>
</client>
# Verify data after the test has been "shot"
<verify>
<stdout>
count = 2
count = 1
</stdout>
</verify>
</testcase>

6
tests/libtest/Makefile.inc
View File

@ -64,7 +64,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \
lib1905 lib1906 lib1907 lib1908 lib1910 lib1911 lib1912 lib1913 \
lib1915 lib1916 lib1917 lib1918 lib1919 \
lib1933 lib1934 lib1935 lib1936 lib1937 lib1938 lib1939 lib1940 \
lib1945 lib1946 \
lib1945 lib1946 lib1947 \
lib3010 lib3025 lib3026 lib3027
chkdecimalpoint_SOURCES = chkdecimalpoint.c ../../lib/mprintf.c \
@ -748,6 +748,10 @@ lib1946_SOURCES = lib1940.c $(SUPPORTFILES)
lib1946_LDADD = $(TESTUTIL_LIBS)
lib1946_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1946
lib1947_SOURCES = lib1947.c $(SUPPORTFILES)
lib1947_LDADD = $(TESTUTIL_LIBS)
lib1947_CPPFLAGS = $(AM_CPPFLAGS)
lib3010_SOURCES = lib3010.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
lib3010_LDADD = $(TESTUTIL_LIBS)
lib3010_CPPFLAGS = $(AM_CPPFLAGS)

89
tests/libtest/lib1947.c Normal file
View File

@ -0,0 +1,89 @@
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2022, 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
* are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
* furnished to do so, under the terms of the COPYING file.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "test.h"
#include "memdebug.h"
static size_t writecb(char *data, size_t n, size_t l, void *userp)
{
/* ignore the data */
(void)data;
(void)userp;
return n*l;
}
int test(char *URL)
{
CURL *curl;
CURLcode res;
curl_global_init(CURL_GLOBAL_DEFAULT);
curl = curl_easy_init();
if(curl) {
struct curl_header *h;
int count = 0;
int origins;
/* perform a request that involves redirection */
curl_easy_setopt(curl, CURLOPT_URL, URL);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writecb);
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
res = curl_easy_perform(curl);
if(res)
fprintf(stderr, "curl_easy_perform() failed: %s\n",
curl_easy_strerror(res));
/* count the number of requests by reading the first header of each
request. */
origins = (CURLH_HEADER|CURLH_TRAILER|CURLH_CONNECT|
CURLH_1XX|CURLH_PSEUDO);
do {
h = curl_easy_nextheader(curl, origins, count, NULL);
if(h)
count++;
} while(h);
printf("count = %u\n", count);
/* perform another request - without redirect */
curl_easy_setopt(curl, CURLOPT_URL, libtest_arg2);
res = curl_easy_perform(curl);
if(res)
fprintf(stderr, "curl_easy_perform() failed: %s\n",
curl_easy_strerror(res));
/* count the number of requests again. */
count = 0;
do {
h = curl_easy_nextheader(curl, origins, count, NULL);
if(h)
count++;
} while(h);
printf("count = %u\n", count);
curl_easy_cleanup(curl);
}
curl_global_cleanup();
return 0;
}