diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2021-09-02 15:57:25 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-09-02 23:42:18 +0200 |
| commit | 424051d78b949fa316f88d5268066ff5e538b352 (patch) | |
| tree | 8db56078097c45404deb5bc9f07b7a29ff34e34c | |
| parent | 1b70748e862eaa4d2ae4b8e1d34bc3b47540af22 (diff) | |
| download | curl-424051d78b949fa316f88d5268066ff5e538b352.tar.gz | |
connect: get local port + ip also when reusing connections
Regression. In d6a37c23a3c (7.75.0) we removed the duplicated storage
(connection + easy handle), so this info needs be extracted again even
for re-used connections.
Add test 435 to verify
Reported-by: Max Dymond
Fixes #7660
Closes #7662
| -rw-r--r-- | lib/connect.c | 5 | ||||
| -rw-r--r-- | tests/data/Makefile.inc | 2 | ||||
| -rw-r--r-- | tests/data/test435 | 71 |
3 files changed, 74 insertions, 4 deletions
diff --git a/lib/connect.c b/lib/connect.c index a6a062718..d61b0374e 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -751,10 +751,9 @@ void Curl_updateconninfo(struct Curl_easy *data, struct connectdata *conn, int local_port = -1; if(conn->transport == TRNSPRT_TCP) { - if(!conn->bits.reuse && !conn->bits.tcp_fastopen) { + if(!conn->bits.reuse && !conn->bits.tcp_fastopen) Curl_conninfo_remote(data, conn, sockfd); - Curl_conninfo_local(data, sockfd, local_ip, &local_port); - } + Curl_conninfo_local(data, sockfd, local_ip, &local_port); } /* end of TCP-only section */ /* persist connection info in session handle */ diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index 1aff37d24..4fd9b6fe0 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -67,7 +67,7 @@ test392 test393 test394 test395 test396 test397 \ test400 test401 test402 test403 test404 test405 test406 test407 test408 \ test409 test410 \ \ -test430 test431 test432 test433 test434 \ +test430 test431 test432 test433 test434 test435 \ \ test490 test491 test492 test493 test494 \ \ diff --git a/tests/data/test435 b/tests/data/test435 new file mode 100644 index 000000000..eed9e2981 --- /dev/null +++ b/tests/data/test435 @@ -0,0 +1,71 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +</keywords> +</info> + +# +# Server-side +<reply> +<data nocheck="yes"> +HTTP/1.1 200 OK
+Content-Length: 0
+
+</data> +</reply> + +# +# Client-side +<client> +<server> +http +</server> +<name> +verify -w local/remote port+ip after connecton re-use +</name> +<command> +http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w 'local port == %{local_port}\nlocal ip == %{local_ip}\nremote_ip == %{remote_ip}\nremote_port == %{remote_port}\n' +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<protocol> +GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+</protocol> + +# replace the number with a fixed string since the port number is not +# known to the test script but it should always be a decimal number +<stripfile> +s/local port == (\d+)/local port == [digits]/ +</stripfile> +<stdout> +HTTP/1.1 200 OK
+Content-Length: 0
+
+local port == [digits] +local ip == 127.0.0.1 +remote_ip == %HOSTIP +remote_port == %HTTPPORT +HTTP/1.1 200 OK
+Content-Length: 0
+
+local port == [digits] +local ip == 127.0.0.1 +remote_ip == %HOSTIP +remote_port == %HTTPPORT +</stdout> +</verify> +</testcase> |