Skip to content
Permalink
Browse files

multi: support verbose conncache closure handle

- Change closure handle to receive verbose setting from the easy handle
  most recently added via curl_multi_add_handle.

The closure handle is a special easy handle used for closing cached
connections. It receives limited settings from the easy handle most
recently added to the multi handle. Prior to this change that did not
include verbose which was a problem because on connection shutdown
verbose mode was not acknowledged.

Ref: #3598

Co-authored-by: Daniel Stenberg

Closes #3618
  • Loading branch information...
jay committed Feb 26, 2019
1 parent 15401fa commit b0972bc8e1296dff4b43869ef88123ecce456c41
Showing with 6 additions and 0 deletions.
  1. +2 −0 lib/multi.c
  2. +4 −0 tests/data/test1506
@@ -497,6 +497,8 @@ CURLMcode curl_multi_add_handle(struct Curl_multi *multi,
data->set.server_response_timeout;
data->state.conn_cache->closure_handle->set.no_signal =
data->set.no_signal;
data->state.conn_cache->closure_handle->set.verbose =
data->set.verbose;

update_timer(multi);
return CURLM_OK;
@@ -88,9 +88,13 @@ Accept: */*
* Connection #2 to host server3.example.com left intact
* Closing connection 0
* Connection #3 to host server4.example.com left intact
* Closing connection
* Closing connection
* Closing connection
</file>
<stripfile>
$_ = '' if (($_ !~ /left intact/) && ($_ !~ /Closing connection/))
s/^(\* Closing connection) [123](?=\r?\n)/$1/
</stripfile>
</verify>
</testcase>

0 comments on commit b0972bc

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.