romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-15 00:21:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

libcurl: reset rewind flag in curl_easy_reset()

Browse source 
curl_easy_reset() did not reset the `rewind_read` flag. This caused any
handles that previously had a CURLE_SEND_FAIL_REWIND error to get stuck
with that error, failing any subsequent requests, even if they didn't
have any body at all.

Verified in test 3034

Fixes #18206
Closes #18207
This commit is contained in:
Oxan van Leeuwen 2025-08-06 14:09:32 +02:00 • committed by Daniel Stenberg
parent ab9dfebdae
commit a93113b5b4
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
5 changed files with 120 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/request.c
View file

@ -153,6 +153,7 @@ void Curl_req_hard_reset(struct SingleRequest *req, struct Curl_easy *data)
req->eos_written = FALSE;
req->eos_read = FALSE;
req->eos_sent = FALSE;
req->rewind_read = FALSE;
req->upload_done = FALSE;
req->upload_aborted = FALSE;
req->ignorebody = FALSE;

2
tests/data/Makefile.am
View file

@ -273,7 +273,7 @@ test3000 test3001 test3002 test3003 test3004 test3005 test3006 test3007 \
test3008 test3009 test3010 test3011 test3012 test3013 test3014 test3015 \
test3016 test3017 test3018 test3019 test3020 test3021 test3022 test3023 \
test3024 test3025 test3026 test3027 test3028 test3029 test3030 test3031 \
test3032 test3033 \
test3032 test3033 test3034 \
\
test3100 test3101 test3102 test3103 test3104 test3105 \
\

40
tests/data/test3034 Normal file
View file

@ -0,0 +1,40 @@
<testcase>
<info>
<keywords>
CURLOPT_READFUNCTION
curl_easy_reset
rewind
</keywords>
</info>
# Server side
<reply>
<data nocheck="yes">
HTTP/1.1 307 Temporary Redirect OK swsclose
Content-Length: 0
Location: /%TESTNUMBER
</data>
</reply>
# Client side
<client>
<server>
http
</server>
<tool>
lib%TESTNUMBER
</tool>
<name>
Test reset resolves rewind failure
</name>
<command>
http://%HOSTIP:%HTTPPORT/%TESTNUMBER
</command>
</client>
<verify>
<errorcode>
0
</errorcode>
</verify>
</testcase>

2
tests/libtest/Makefile.inc
View file

@ -104,6 +104,6 @@ TESTS_C = \
lib2402.c lib2404.c lib2405.c \
lib2502.c \
lib2700.c \
lib3010.c lib3025.c lib3026.c lib3027.c lib3033.c \
lib3010.c lib3025.c lib3026.c lib3027.c lib3033.c lib3034.c \
lib3100.c lib3101.c lib3102.c lib3103.c lib3104.c lib3105.c \
lib3207.c lib3208.c

77
tests/libtest/lib3034.c Normal file
View file

@ -0,0 +1,77 @@
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 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.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 "first.h"
static const char data_3034[] = "hello";
static size_t t3034_read_cb(char *ptr, size_t size, size_t nmemb, void *userp)
{
size_t len = size * nmemb;
size_t tocopy = sizeof(data_3034) < len ? sizeof(data_3034) : len;
(void)userp;
memcpy(ptr, data_3034, tocopy);
return tocopy;
}
static CURLcode test_lib3034(const char *URL)
{
CURL *curl;
CURLcode res = CURLE_OK;
global_init(CURL_GLOBAL_ALL);
easy_init(curl);
/* This first request will receive a redirect response; deliberately only
* set the CURLOPT_READFUNCTION but not the CURLOPT_SEEKFUNCTION to force a
* rewind failure (CURLE_SEND_FAIL_REWIND).
*/
test_setopt(curl, CURLOPT_VERBOSE, 1L);
test_setopt(curl, CURLOPT_URL, URL);
test_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
test_setopt(curl, CURLOPT_UPLOAD, 1L);
test_setopt(curl, CURLOPT_INFILESIZE, 5L);
test_setopt(curl, CURLOPT_READFUNCTION, t3034_read_cb);
res = curl_easy_perform(curl);
if(res != CURLE_SEND_FAIL_REWIND) {
curl_mfprintf(stderr,
"%s:%d curl_easy_perform() failed with code %d (%s)\n",
__FILE__, __LINE__, res, curl_easy_strerror(res));
goto test_cleanup;
}
/* Reset the easy handle, which should clear the rewind failure. */
curl_easy_reset(curl);
/* Perform a second request, which should succeed. */
test_setopt(curl, CURLOPT_VERBOSE, 1L);
test_setopt(curl, CURLOPT_URL, URL);
res = curl_easy_perform(curl);
test_cleanup:
curl_easy_cleanup(curl);
curl_global_cleanup();
return res;
}