mirror of
https://github.com/curl/curl.git
synced 2026-08-25 08:53:36 +03:00
multi: add CURLMOPT_NETWORK_CHANGED to signal network changed
New multi option CURLMOPT_NETWORK_CHANGED with a long bitmask value: - CURLM_NWCOPT_CLEAR_CONNS: do not reuse existing connections, close all idle connections. - CURLM_NWCOPT_CLEAR_DNS: clear the multi's DNS cache. All other bits reserved for future extensions. Fixes #17225 Reported-by: ウさん Closes #17613
This commit is contained in:
Stefan Eissing
Daniel Stenberg
parent
7b8594176d
commit
55c045c863
19 changed files with 354 additions and 4 deletions
|
|
@ -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 \
|
||||
test3032 test3033 \
|
||||
\
|
||||
test3100 test3101 test3102 test3103 test3104 test3105 \
|
||||
\
|
||||
|
|
|
|||
53
tests/data/test3033
Normal file
53
tests/data/test3033
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
<testcase>
|
||||
<info>
|
||||
<keywords>
|
||||
curl_easy_setopt
|
||||
connection reuse
|
||||
libtest
|
||||
</keywords>
|
||||
</info>
|
||||
|
||||
#
|
||||
# Server-side
|
||||
<reply>
|
||||
<data>
|
||||
HTTP/1.1 200 OK
|
||||
Content-Length: 6
|
||||
|
||||
-foo-
|
||||
</data>
|
||||
<datacheck>
|
||||
[0] no network change
|
||||
-foo-
|
||||
[1] signal network change
|
||||
-foo-
|
||||
[2] no network change
|
||||
-foo-
|
||||
</datacheck>
|
||||
</reply>
|
||||
|
||||
#
|
||||
# Client-side
|
||||
<client>
|
||||
<server>
|
||||
http
|
||||
</server>
|
||||
<name>
|
||||
CURLOPT_FRESH_CONNECT=2
|
||||
</name>
|
||||
<tool>
|
||||
lib%TESTNUMBER
|
||||
</tool>
|
||||
<command>
|
||||
http://%HOSTIP:%HTTPPORT/%TESTNUMBER
|
||||
</command>
|
||||
</client>
|
||||
|
||||
#
|
||||
# Verify data after the test has been "shot"
|
||||
<verify>
|
||||
<errorcode>
|
||||
0
|
||||
</errorcode>
|
||||
</verify>
|
||||
</testcase>
|
||||
|
|
@ -93,6 +93,6 @@ TESTS_C = \
|
|||
lib2402.c lib2404.c lib2405.c \
|
||||
lib2502.c \
|
||||
lib2700.c \
|
||||
lib3010.c lib3025.c lib3026.c lib3027.c \
|
||||
lib3010.c lib3025.c lib3026.c lib3027.c lib3033.c \
|
||||
lib3100.c lib3101.c lib3102.c lib3103.c lib3104.c lib3105.c \
|
||||
lib3207.c lib3208.c
|
||||
|
|
|
|||
129
tests/libtest/lib3033.c
Normal file
129
tests/libtest/lib3033.c
Normal file
|
|
@ -0,0 +1,129 @@
|
|||
/***************************************************************************
|
||||
* _ _ ____ _
|
||||
* 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 "testtrace.h"
|
||||
#include "testutil.h"
|
||||
#include "memdebug.h"
|
||||
|
||||
|
||||
static CURLcode t3033_req_test(CURLM *multi, CURL *easy,
|
||||
char *url_3033, int index)
|
||||
{
|
||||
CURLMsg *msg = NULL;
|
||||
CURLcode res = CURLE_OK;
|
||||
int still_running = 0;
|
||||
|
||||
if(index == 1) {
|
||||
curl_multi_setopt(multi, CURLMOPT_NETWORK_CHANGED,
|
||||
CURLM_NWCOPT_CLEAR_CONNS);
|
||||
curl_mprintf("[1] signal network change\n");
|
||||
}
|
||||
else {
|
||||
curl_mprintf("[%d] no network change\n", index);
|
||||
}
|
||||
|
||||
curl_easy_reset(easy);
|
||||
curl_easy_setopt(easy, CURLOPT_URL, url_3033);
|
||||
easy_setopt(easy, CURLOPT_DEBUGDATA, &libtest_debug_config);
|
||||
easy_setopt(easy, CURLOPT_DEBUGFUNCTION, libtest_debug_cb);
|
||||
easy_setopt(easy, CURLOPT_VERBOSE, 1L);
|
||||
|
||||
curl_multi_add_handle(multi, easy);
|
||||
|
||||
do {
|
||||
CURLMcode mres;
|
||||
int num;
|
||||
curl_multi_perform(multi, &still_running);
|
||||
mres = curl_multi_wait(multi, NULL, 0, TEST_HANG_TIMEOUT, &num);
|
||||
if(mres != CURLM_OK) {
|
||||
curl_mfprintf(stderr, "curl_multi_wait() returned %d\n", mres);
|
||||
res = TEST_ERR_MAJOR_BAD;
|
||||
goto test_cleanup;
|
||||
}
|
||||
} while(still_running);
|
||||
|
||||
do {
|
||||
long num_connects = 0L;
|
||||
msg = curl_multi_info_read(multi, &still_running);
|
||||
if(msg) {
|
||||
if(msg->msg != CURLMSG_DONE)
|
||||
continue;
|
||||
|
||||
res = msg->data.result;
|
||||
if(res != CURLE_OK) {
|
||||
curl_mfprintf(stderr, "curl_multi_info_read() returned %d\n", res);
|
||||
goto test_cleanup;
|
||||
}
|
||||
|
||||
curl_easy_getinfo(easy, CURLINFO_NUM_CONNECTS, &num_connects);
|
||||
if(index == 1 && num_connects == 0) {
|
||||
curl_mprintf("[1] should not reuse connection in pool\n");
|
||||
res = TEST_ERR_MAJOR_BAD;
|
||||
goto test_cleanup;
|
||||
}
|
||||
else if(index == 2 && num_connects) {
|
||||
curl_mprintf("[2] should have reused connection from [1]\n");
|
||||
res = TEST_ERR_MAJOR_BAD;
|
||||
goto test_cleanup;
|
||||
}
|
||||
}
|
||||
} while(msg);
|
||||
|
||||
test_cleanup:
|
||||
|
||||
curl_multi_remove_handle(multi, easy);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
static CURLcode test_lib3033(char *URL)
|
||||
{
|
||||
CURL *curl = NULL;
|
||||
CURLM *multi = NULL;
|
||||
CURLcode res = CURLE_OK;
|
||||
|
||||
global_init(CURL_GLOBAL_ALL);
|
||||
multi_init(multi);
|
||||
easy_init(curl);
|
||||
|
||||
libtest_debug_config.nohex = 1;
|
||||
libtest_debug_config.tracetime = 1;
|
||||
|
||||
res = t3033_req_test(multi, curl, URL, 0);
|
||||
if(res != CURLE_OK)
|
||||
goto test_cleanup;
|
||||
res = t3033_req_test(multi, curl, URL, 1);
|
||||
if(res != CURLE_OK)
|
||||
goto test_cleanup;
|
||||
res = t3033_req_test(multi, curl, URL, 2);
|
||||
if(res != CURLE_OK)
|
||||
goto test_cleanup;
|
||||
|
||||
test_cleanup:
|
||||
|
||||
curl_easy_cleanup(curl);
|
||||
curl_multi_cleanup(multi);
|
||||
curl_global_cleanup();
|
||||
|
||||
return res; /* return the final return code */
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue