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: https://github.com/curl/curl/pull/3598

Co-authored-by: Daniel Stenberg

Closes https://github.com/curl/curl/pull/3618
This commit is contained in:
Jay Satiro 2019-02-26 02:17:03 -05:00
parent 15401fa886
commit b0972bc8e1
2 changed files with 6 additions and 0 deletions

View File

@ -497,6 +497,8 @@ CURLMcode curl_multi_add_handle(struct Curl_multi *multi,
data->set.server_response_timeout; data->set.server_response_timeout;
data->state.conn_cache->closure_handle->set.no_signal = data->state.conn_cache->closure_handle->set.no_signal =
data->set.no_signal; data->set.no_signal;
data->state.conn_cache->closure_handle->set.verbose =
data->set.verbose;
update_timer(multi); update_timer(multi);
return CURLM_OK; return CURLM_OK;

View File

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