From b0972bc8e1296dff4b43869ef88123ecce456c41 Mon Sep 17 00:00:00 2001 From: Jay Satiro Date: Tue, 26 Feb 2019 02:17:03 -0500 Subject: 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 --- lib/multi.c | 2 ++ tests/data/test1506 | 4 ++++ 2 files changed, 6 insertions(+) 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 $_ = '' if (($_ !~ /left intact/) && ($_ !~ /Closing connection/)) +s/^(\* Closing connection) [123](?=\r?\n)/$1/ -- cgit v1.2.3