mirror of
https://github.com/curl/curl.git
synced 2026-04-24 02:12:17 +03:00
connection: terminate after goaway
When a multiplex connection (h2/h3) is shutdown by the server, the reported number of parallel transfers allowed drops to 0. Determine that when the last transfer is done and terminate the connection instead of keeping it in the cache. We detect the drop to 0 also when we try to reuse such a connection, but if we know this at the time the last transfer is done, we better terminate it right away. Have a consistent trace logging to this with the connections current hostname and port. Adjust test expectations to carry port numbers. Closes #17884
This commit is contained in:
parent
2ec54556d4
commit
b453a447ce
8 changed files with 58 additions and 42 deletions
|
|
@ -83,10 +83,10 @@ Accept: */*
|
|||
^Host:.*
|
||||
</strip>
|
||||
<file name="%LOGDIR/stderr%TESTNUMBER" mode="text">
|
||||
* Connection #0 to host server1.example.com left intact
|
||||
* Connection #1 to host server2.example.com left intact
|
||||
* Connection #2 to host server3.example.com left intact
|
||||
* Connection #3 to host server4.example.com left intact
|
||||
* Connection #0 to host server1.example.com:%HTTPPORT left intact
|
||||
* Connection #1 to host server2.example.com:%HTTPPORT left intact
|
||||
* Connection #2 to host server3.example.com:%HTTPPORT left intact
|
||||
* Connection #3 to host server4.example.com:%HTTPPORT left intact
|
||||
</file>
|
||||
<stripfile>
|
||||
$_ = '' if(($_ !~ /left intact/) && ($_ !~ /Closing connection/))
|
||||
|
|
|
|||
|
|
@ -83,10 +83,10 @@ Accept: */*
|
|||
^Host:.*
|
||||
</strip>
|
||||
<file name="%LOGDIR/stderr%TESTNUMBER" mode="text">
|
||||
* Connection #0 to host server1.example.com left intact
|
||||
* Connection #1 to host server2.example.com left intact
|
||||
* Connection #2 to host server3.example.com left intact
|
||||
* Connection #3 to host server4.example.com left intact
|
||||
* Connection #0 to host server1.example.com:%HTTPPORT left intact
|
||||
* Connection #1 to host server2.example.com:%HTTPPORT left intact
|
||||
* Connection #2 to host server3.example.com:%HTTPPORT left intact
|
||||
* Connection #3 to host server4.example.com:%HTTPPORT left intact
|
||||
</file>
|
||||
<stripfile>
|
||||
$_ = '' if(($_ !~ /left intact/) && ($_ !~ /Closing connection/))
|
||||
|
|
|
|||
|
|
@ -55,11 +55,11 @@ Accept: */*
|
|||
|
||||
</protocol>
|
||||
<file name="%LOGDIR/stderr%TESTNUMBER" mode="text">
|
||||
== Info: Connection #0 to host %HOSTIP left intact
|
||||
== Info: Connection #0 to host %HOSTIP left intact
|
||||
== Info: Connection #0 to host %HOSTIP left intact
|
||||
== Info: Connection #0 to host %HOSTIP:%HTTPPORT left intact
|
||||
== Info: Connection #0 to host %HOSTIP:%HTTPPORT left intact
|
||||
== Info: Connection #0 to host %HOSTIP:%HTTPPORT left intact
|
||||
== Info: shutting down connection #0
|
||||
== Info: Connection #1 to host %HOSTIP left intact
|
||||
== Info: Connection #1 to host %HOSTIP:%HTTPPORT left intact
|
||||
</file>
|
||||
<stripfile>
|
||||
$_ = '' if(($_ !~ /left intact/) && ($_ !~ /(closing|shutting down) connection #\d+/))
|
||||
|
|
|
|||
|
|
@ -96,10 +96,10 @@ Via: 2 nghttpx
|
|||
^Host:.*
|
||||
</strip>
|
||||
<file name="%LOGDIR/stderr%TESTNUMBER" mode="text">
|
||||
* Connection #0 to host localhost left intact
|
||||
* Connection #0 to host localhost left intact
|
||||
* Connection #0 to host localhost left intact
|
||||
* Connection #0 to host localhost left intact
|
||||
* Connection #0 to host localhost:%HTTP2TLSPORT left intact
|
||||
* Connection #0 to host localhost:%HTTP2TLSPORT left intact
|
||||
* Connection #0 to host localhost:%HTTP2TLSPORT left intact
|
||||
* Connection #0 to host localhost:%HTTP2TLSPORT left intact
|
||||
</file>
|
||||
<stripfile>
|
||||
$_ = '' if(($_ !~ /left intact/) && ($_ !~ /Closing connection/))
|
||||
|
|
|
|||
|
|
@ -96,10 +96,10 @@ Via: 2 nghttpx
|
|||
^Host:.*
|
||||
</strip>
|
||||
<file name="%LOGDIR/stderr%TESTNUMBER" mode="text">
|
||||
* Connection #0 to host localhost left intact
|
||||
* Connection #0 to host localhost left intact
|
||||
* Connection #0 to host localhost left intact
|
||||
* Connection #0 to host localhost left intact
|
||||
* Connection #0 to host localhost:%HTTP2TLSPORT left intact
|
||||
* Connection #0 to host localhost:%HTTP2TLSPORT left intact
|
||||
* Connection #0 to host localhost:%HTTP2TLSPORT left intact
|
||||
* Connection #0 to host localhost:%HTTP2TLSPORT left intact
|
||||
</file>
|
||||
<stripfile>
|
||||
$_ = '' if(($_ !~ /left intact/) && ($_ !~ /Closing connection/))
|
||||
|
|
|
|||
|
|
@ -91,10 +91,10 @@ Via: 3 nghttpx
|
|||
^Host:.*
|
||||
</strip>
|
||||
<file name="%LOGDIR/stderr%TESTNUMBER" mode="text">
|
||||
== Info: Connection #0 to host localhost left intact
|
||||
== Info: Connection #0 to host localhost left intact
|
||||
== Info: Connection #0 to host localhost left intact
|
||||
== Info: Connection #0 to host localhost left intact
|
||||
== Info: Connection #0 to host localhost:%HTTP3PORT left intact
|
||||
== Info: Connection #0 to host localhost:%HTTP3PORT left intact
|
||||
== Info: Connection #0 to host localhost:%HTTP3PORT left intact
|
||||
== Info: Connection #0 to host localhost:%HTTP3PORT left intact
|
||||
</file>
|
||||
<stripfile>
|
||||
$_ = '' if(($_ !~ /left intact/) && ($_ !~ /Closing connection/))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue