Merge branch 'PHP-8.6'

* PHP-8.6:
  Update NEWS
  ext/standard/tests: work around Windows quoting with tempfiles.
  .github/scripts/windows: pass an extension_dir to the test runner.
  {ext/standard,sapi/cli}/tests: pass TEST_PHP_EXTRA_ARGS to php
  ext/standard/tests: pass TEST_PHP_EXTRA_ARGS to some proc_open() tests
  sapi/cli/tests/023.phpt: support TEST_PHP_EXTRA_ARGS
  std: Fix memory leak of the last response headers after a nested HTTP request (#24201)
  Fiber: hold the object a callable resolved to in the creating frame (#24134)

Author: Girgias

.github/scripts/windows/test_task.bat

@@ -90,7 +90,10 @@ set OPENSSL_CONF=
 rem set SSLEAY_CONF=
 
 rem prepare for OPcache
-if "%OPCACHE%" equ "1" set OPCACHE_OPTS=-d opcache.enable=1 -d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=64M -d opcache.jit=tracing
+set PHP_BUILD_DIR=%PHP_BUILD_OBJ_DIR%\Release
+if "%THREAD_SAFE%" equ "1" set PHP_BUILD_DIR=%PHP_BUILD_DIR%_TS
+
+if "%OPCACHE%" equ "1" set OPCACHE_OPTS=-d opcache.enable=1 -d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=64M -d opcache.jit=tracing -d extension_dir=%PHP_BUILD_DIR%
 
 rem prepare for enchant
 mkdir %~d0\usr\local\lib\enchant-2
@@ -111,9 +114,6 @@ set MIBDIRS=%DEPS_DIR%\share\mibs
 sed -i "s/exec HexTest .*/exec HexTest cscript\.exe \/nologo %GITHUB_WORKSPACE:\=\/%\/ext\/snmp\/tests\/bigtest\.js/g" %GITHUB_WORKSPACE%\ext\snmp\tests\snmpd.conf
 start %DEPS_DIR%\bin\snmpd.exe -C -c %GITHUB_WORKSPACE%\ext\snmp\tests\snmpd.conf -Ln
 
-set PHP_BUILD_DIR=%PHP_BUILD_OBJ_DIR%\Release
-if "%THREAD_SAFE%" equ "1" set PHP_BUILD_DIR=%PHP_BUILD_DIR%_TS
-
 rem prepare for mail
 curl -sLo hMailServer.zip https://downloads.php.net/~windows/php-sdk/deps/vs18/x64/hmailserver-5.7.0-vs18-x64.zip
 unzip -q hMailServer.zip -d hMailServer

Zend/tests/fibers/fiber-callable-object-outlives-caller.phpt

@@ -0,0 +1,85 @@
+--TEST--
+Fiber holds the object a callable resolved to in the creating method ($this for [A::class, 'm'] or "A::m")
+--FILE--
+<?php
+class A {
+    public ?Fiber $fiber = null;
+
+    public function __construct(public string $name) {}
+
+    public function m() {
+        echo "m on {$this->name}\n";
+    }
+
+    public function waits() {
+        Fiber::suspend();
+        echo "resumed on {$this->name}\n";
+    }
+
+    public function make(string $method) {
+        return new Fiber([A::class, $method]);
+    }
+
+    public function makeFromString() {
+        return new Fiber("A::m");
+    }
+
+    public function keep() {
+        $this->fiber = new Fiber([A::class, 'm']);
+    }
+
+    public function __destruct() {
+        echo "released {$this->name}\n";
+    }
+}
+
+echo "-- started after its creator's last reference went\n";
+$fiber = (new A("a1"))->make('m');
+$fiber->start();
+echo "after start\n";
+
+echo "-- a string callable\n";
+$fiber = (new A("a2"))->makeFromString();
+$fiber->start();
+echo "after start\n";
+
+echo "-- never started, released with the fiber\n";
+$fiber = (new A("a3"))->make('m');
+unset($fiber);
+echo "after unset\n";
+
+echo "-- suspended while its object has no other reference\n";
+$a = new A("a4");
+$fiber = $a->make('waits');
+$fiber->start();
+unset($a);
+$fiber->resume();
+echo "after resume\n";
+
+echo "-- a cycle through the fiber is collected\n";
+$a = new A("a5");
+$a->keep();
+unset($a);
+var_dump(gc_collect_cycles());
+echo "end\n";
+?>
+--EXPECT--
+-- started after its creator's last reference went
+m on a1
+released a1
+after start
+-- a string callable
+m on a2
+released a2
+after start
+-- never started, released with the fiber
+released a3
+after unset
+-- suspended while its object has no other reference
+resumed on a4
+released a4
+after resume
+-- a cycle through the fiber is collected
+released a5
+int(2)
+end

Zend/zend_fibers.c

@@ -563,6 +563,39 @@ static void zend_fiber_cleanup(zend_fiber_context *context)
 	fiber->caller = NULL;
 }
 
+static void zend_fiber_addref_callable(zend_fiber *fiber)
+{
+	// Keep a reference to closures or callable objects while the fiber is running.
+	Z_TRY_ADDREF(fiber->fci.function_name);
+
+	/* For [A::class, 'm'] or "A::m" inside a method of A, fci.object is the caller's $this. */
+	if (fiber->fci.object != NULL) {
+		GC_ADDREF(fiber->fci.object);
+	}
+}
+
+static void zend_fiber_get_gc_callable(zend_fiber *fiber, zend_get_gc_buffer *buf)
+{
+	zend_get_gc_buffer_add_zval(buf, &fiber->fci.function_name);
+
+	if (fiber->fci.object != NULL) {
+		zend_get_gc_buffer_add_obj(buf, fiber->fci.object);
+	}
+}
+
+static void zend_fiber_release_callable(zend_fiber *fiber)
+{
+	zval_ptr_dtor(&fiber->fci.function_name);
+	ZVAL_UNDEF(&fiber->fci.function_name);
+	fiber->fci_cache = empty_fcall_info_cache;
+
+	if (fiber->fci.object != NULL) {
+		zend_object *object = fiber->fci.object;
+		fiber->fci.object = NULL;
+		OBJ_RELEASE(object);
+	}
+}
+
 static ZEND_STACK_ALIGNED void zend_fiber_execute(zend_fiber_transfer *transfer)
 {
 	ZEND_ASSERT(Z_TYPE(transfer->value) == IS_NULL && "Initial transfer value to fiber context must be NULL");
@@ -605,8 +638,7 @@ static ZEND_STACK_ALIGNED void zend_fiber_execute(zend_fiber_transfer *transfer)
 		zend_call_function(&fiber->fci, &fiber->fci_cache);
 
 		/* Cleanup callback and unset field to prevent GC / duplicate dtor issues. */
-		zval_ptr_dtor(&fiber->fci.function_name);
-		ZVAL_UNDEF(&fiber->fci.function_name);
+		zend_fiber_release_callable(fiber);
 
 		if (EG(exception)) {
 			if (!(fiber->flags & ZEND_FIBER_FLAG_DESTROYED)
@@ -808,7 +840,7 @@ static void zend_fiber_object_free(zend_object *object)
 {
 	zend_fiber *fiber = (zend_fiber *) object;
 
-	zval_ptr_dtor(&fiber->fci.function_name);
+	zend_fiber_release_callable(fiber);
 	zval_ptr_dtor(&fiber->result);
 
 	zend_object_std_dtor(&fiber->std);
@@ -819,7 +851,7 @@ static HashTable *zend_fiber_object_gc(zend_object *object, zval **table, int *n
 	zend_fiber *fiber = (zend_fiber *) object;
 	zend_get_gc_buffer *buf = zend_get_gc_buffer_create();
 
-	zend_get_gc_buffer_add_zval(buf, &fiber->fci.function_name);
+	zend_fiber_get_gc_callable(fiber, buf);
 	zend_get_gc_buffer_add_zval(buf, &fiber->result);
 
 	if (fiber->context.status != ZEND_FIBER_STATUS_SUSPENDED || fiber->caller != NULL) {
@@ -887,8 +919,7 @@ ZEND_METHOD(Fiber, __construct)
 	fiber->fci = fci;
 	fiber->fci_cache = fcc;
 
-	// Keep a reference to closures or callable objects while the fiber is running.
-	Z_TRY_ADDREF(fiber->fci.function_name);
+	zend_fiber_addref_callable(fiber);
 }
 
 ZEND_METHOD(Fiber, start)

ext/standard/http_fopen_wrapper.c

@@ -1277,16 +1277,15 @@ php_stream *php_stream_url_wrap_http(php_stream_wrapper *wrapper, const char *pa
 
 	ZVAL_UNDEF(&headers);
 
-	zval_ptr_dtor(&BG(last_http_headers));
-	ZVAL_UNDEF(&BG(last_http_headers));
-
 	stream = php_stream_url_wrap_http_ex(
 		wrapper, path, mode, options, opened_path, context,
 		PHP_URL_REDIRECT_MAX, HTTP_WRAPPER_HEADER_INIT, &headers STREAMS_CC);
 
-	if (!Z_ISUNDEF(headers)) {
-		ZVAL_COPY(&BG(last_http_headers), &headers);
+	/* After the request: one made from its notification callback may have stored its own headers here. */
+	zval_ptr_dtor(&BG(last_http_headers));
+	ZVAL_COPY(&BG(last_http_headers), &headers);
 
+	if (!Z_ISUNDEF(headers)) {
 		if (FAILURE == zend_set_local_var_str(
 				"http_response_header", sizeof("http_response_header")-1, &headers, 0)) {
 			zval_ptr_dtor(&headers);

ext/standard/tests/file/bug60120.phpt

@@ -14,7 +14,9 @@ if (PHP_OS_FAMILY === 'Windows') die('skip not for Windows');
 error_reporting(E_ALL);
 
 $php = getenv('TEST_PHP_EXECUTABLE_ESCAPED');
-$cmd = $php . ' -r "\$in = file_get_contents(\'php://stdin\'); fwrite(STDOUT, \$in); fwrite(STDERR, \$in);"';
+$args = getenv('TEST_PHP_EXTRA_ARGS');
+$cmd = ' -r "\$in = file_get_contents(\'php://stdin\'); fwrite(STDOUT, \$in); fwrite(STDERR, \$in);"';
+$cmd = join(' ', [$php, $args, $cmd]);
 $descriptors = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w'));
 $stdin = str_repeat('*', 2049 );
 

ext/standard/tests/general_functions/proc_open_null.phpt

@@ -4,7 +4,10 @@ Null pipes in proc_open()
 <?php
 
 $php = getenv('TEST_PHP_EXECUTABLE');
-$cmd = [$php, '-r', 'echo "Test"; fprintf(STDERR, "Error");'];
+$args = getenv('TEST_PHP_EXTRA_ARGS');
+$fn = tempnam(sys_get_temp_dir(), "PROC_OPEN_TEST");
+$cmd = "$php $args " . escapeshellarg($fn);
+file_put_contents($fn, '<?php echo "Test"; fprintf(STDERR, "Error");');
 
 $proc = proc_open($cmd, [1 => ['null'], 2 => ['pipe', 'w']], $pipes);
 var_dump($pipes);
@@ -15,16 +18,17 @@ $proc = proc_open($cmd, [1 => ['pipe', 'w'], 2 => ['null']], $pipes);
 var_dump($pipes);
 var_dump(stream_get_contents($pipes[1]));
 proc_close($proc);
+unlink($fn);
 
 ?>
 --EXPECT--
 array(1) {
   [2]=>
-  resource(4) of type (stream)
+  resource(6) of type (stream)
 }
 string(5) "Error"
 array(1) {
   [1]=>
-  resource(6) of type (stream)
+  resource(8) of type (stream)
 }
 string(4) "Test"

ext/standard/tests/general_functions/proc_open_redirect.phpt

@@ -4,26 +4,31 @@ Redirection support in proc_open
 <?php
 
 $php = getenv('TEST_PHP_EXECUTABLE');
+$args = getenv('TEST_PHP_EXTRA_ARGS');
+$cmd = "$php $args";
+
 try {
-    proc_open([$php], [['redirect']], $pipes);
+    proc_open($cmd, [['redirect']], $pipes);
 } catch (Throwable $exception) {
     echo $exception::class, ': ', $exception->getMessage(), "\n";
 }
 
 try {
-    proc_open([$php], [['redirect', 'foo']], $pipes);
+    proc_open($cmd, [['redirect', 'foo']], $pipes);
 } catch (Throwable $exception) {
     echo $exception::class, ': ', $exception->getMessage(), "\n";
 }
 
 try {
-    proc_open([$php], [['redirect', 42]], $pipes);
+    proc_open($cmd, [['redirect', 42]], $pipes);
 } catch (Throwable $exception) {
     echo $exception::class, ': ', $exception->getMessage(), "\n";
 }
 
 echo "\nWith pipe:\n";
-$cmd = [$php, '-r', 'echo "Test\n"; fprintf(STDERR, "Error");'];
+$fn = tempnam(sys_get_temp_dir(), "PROC_OPEN_TEST");
+file_put_contents($fn, '<?php echo "Test\n"; fprintf(STDERR, "Error");');
+$cmd = "$php $args " . escapeshellarg($fn);
 $proc = proc_open($cmd, [1 => ['pipe', 'w'], 2 => ['redirect', 1]], $pipes);
 var_dump($pipes);
 var_dump(stream_get_contents($pipes[1]));
@@ -49,6 +54,7 @@ unlink($fileName);
 echo "\nWith inherited stdout:\n";
 $proc = proc_open($cmd, [2 => ['redirect', 1]], $pipes);
 proc_close($proc);
+unlink($fn);
 
 ?>
 --EXPECTF--
@@ -60,7 +66,7 @@ Warning: proc_open(): Redirection target 42 not found in %s
 With pipe:
 array(1) {
   [1]=>
-  resource(4) of type (stream)
+  resource(6) of type (stream)
 }
 string(10) "Test
 Error"

ext/standard/tests/general_functions/proc_open_sockets1.phpt

@@ -7,10 +7,9 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 --FILE--
 <?php
 
-$cmd = [
-    getenv("TEST_PHP_EXECUTABLE"),
-    __DIR__ . '/proc_open_sockets1.inc'
-];
+$php = getenv("TEST_PHP_EXECUTABLE");
+$args = getenv("TEST_PHP_EXTRA_ARGS");
+$cmd = "$php $args " . __DIR__ . '/proc_open_sockets1.inc';
 
 $spec = [
     ['null'],

ext/standard/tests/general_functions/proc_open_sockets2.phpt

@@ -34,10 +34,9 @@ function write_pipe($pipe, $data)
     }
 }
 
-$cmd = [
-    getenv("TEST_PHP_EXECUTABLE"),
-    __DIR__ . '/proc_open_sockets2.inc'
-];
+$php = getenv("TEST_PHP_EXECUTABLE");
+$args = getenv("TEST_PHP_EXTRA_ARGS");
+$cmd = "$php $args " . __DIR__ . '/proc_open_sockets2.inc';
 
 $spec = [
     ['socket'],

ext/standard/tests/general_functions/proc_open_sockets3.phpt

@@ -25,10 +25,9 @@ function read_pipe($pipe): string
     return $chunk;
 }
 
-$cmd = [
-    getenv("TEST_PHP_EXECUTABLE"),
-    __DIR__ . '/proc_open_sockets2.inc'
-];
+$php = getenv("TEST_PHP_EXECUTABLE");
+$args = getenv("TEST_PHP_EXTRA_ARGS");
+$cmd = "$php $args " . __DIR__ . '/proc_open_sockets2.inc';
 
 $spec = [
     ['pipe', 'r'],