From: Michael Wallner <mike@php.net>
Date: Tue, 4 Apr 2017 07:09:20 +0000 (+0200)
Subject: Fix issue #65
X-Git-Tag: RELEASE_3_1_1_RC1~8
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=fd27c0820dea877a663e8be19e17dce8eacade9f;p=m6w6%2Fext-http

Fix issue #65

http\Client::enqueue(): Could not enqueue request: The easy handle
is already added to a multi handle (@rcanavan, Mike)
---

diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c
index 1626b71..e513211 100644
--- a/src/php_http_client_curl.c
+++ b/src/php_http_client_curl.c
@@ -2206,7 +2206,7 @@ static ZEND_RESULT_CODE php_http_client_curl_dequeue(php_http_client_t *h, php_h
 	php_http_client_curl_t *curl = h->ctx;
 	php_http_client_curl_handler_t *handler = enqueue->opaque;
 
-	if (h->callback.depth) {
+	if (h->callback.depth && !CG(unclean_shutdown)) {
 		php_error_docref(NULL, E_WARNING, "Could not dequeue request while executing callbacks");
 		return FAILURE;
 	}