diff options
| author | Jay Satiro <raysatiro@yahoo.com> | 2019-02-26 02:17:03 -0500 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2019-03-05 00:00:01 -0500 |
| commit | b0972bc8e1296dff4b43869ef88123ecce456c41 (patch) | |
| tree | 321ec0c7baa95bc2319d47ff3d9a6e43472613c7 | |
| parent | 15401fa886b707ae2a42b95fa6cf313685306492 (diff) | |
| download | curl-b0972bc8e1296dff4b43869ef88123ecce456c41.tar.gz | |
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
| -rw-r--r-- | lib/multi.c | 2 | ||||
| -rw-r--r-- | tests/data/test1506 | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/multi.c b/lib/multi.c index c7f362dbf..3ebd73aa1 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -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; diff --git a/tests/data/test1506 b/tests/data/test1506 index 815fef923..7377dd6e0 100644 --- a/tests/data/test1506 +++ b/tests/data/test1506 @@ -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> |