From: Michael Wallner <mike@php.net>
Date: Thu, 9 Jun 2022 08:56:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/v3.x'
X-Git-Tag: v4.2.3~3
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=6182cbb81110e28b44f724c401ce1b96b4582d6a;hp=bb947e44a91401fcc622d0cc023dc501c4ffa2b0;p=m6w6%2Fext-http

Merge remote-tracking branch 'origin/v3.x'
---

diff --git a/src/php_http_client.c b/src/php_http_client.c
index a272fa4..dcdfffa 100644
--- a/src/php_http_client.c
+++ b/src/php_http_client.c
@@ -807,6 +807,8 @@ static PHP_METHOD(HttpClient, requeue)
 			if (fci.object) {
 				GC_ADDREF(fci.object);
 			}
+			e->closure.fci = fci;
+			e->closure.fcc = fcc;
 		}
 		RETURN_ZVAL(getThis(), 1, 0);
 	}
diff --git a/tests/helper/dump.inc b/tests/helper/dump.inc
index 5612d06..59d258c 100644
--- a/tests/helper/dump.inc
+++ b/tests/helper/dump.inc
@@ -18,7 +18,7 @@ function dump_message($stream, http\Message $msg, $parent = false) {
 	fprintf($stream, "%s\n", $msg->getInfo());
 	dump_headers($stream, $msg->getHeaders());
 	$msg->getBody()->toStream($stream);
-	
+
 	if ($parent && ($msg = $msg->getParentMessage())) {
 		dump_message($stream, $msg, true);
 	}
@@ -28,7 +28,9 @@ function dump_responses($client, array $expect_cookie = []) {
 	while (($r = $client->getResponse())) {
 		dump_headers(null, $r->getHeaders());
 		if ($expect_cookie) {
-			$got_cookies = array_merge(...array_map(fn($c) => $c->getCookies(), $r->getCookies()));
+			$got_cookies = array_merge(...array_map(function($c) {
+				return $c->getCookies();
+			}, $r->getCookies()));
 			if ($expect_cookie != $got_cookies) {
 				var_dump($expect_cookie, $got_cookies);
 				echo $r->toString(true);