Merge branch 'PHP-8.2'

dstogov · dstogov · commit 72fec0bbf3f9 · 2022-09-12T11:39:36.000+03:00
* PHP-8.2:
  Reset FG(user_stream_current_filename) at the end of request
diff --git a/main/streams/streams.c b/main/streams/streams.c
@@ -1761,6 +1761,7 @@ static void stream_resource_persistent_dtor(zend_resource *rsrc)
 
 void php_shutdown_stream_hashes(void)
 {
+	FG(user_stream_current_filename) = NULL;
 	if (FG(stream_wrappers)) {
 		zend_hash_destroy(FG(stream_wrappers));
 		efree(FG(stream_wrappers));

Original file line number	Diff line number	Diff line change
`@@ -1761,6 +1761,7 @@ static void stream_resource_persistent_dtor(zend_resource *rsrc)`
`1761`	`1761`
`1762`	`1762`	`void php_shutdown_stream_hashes(void)`
`1763`	`1763`	`{`
	`1764`	`+ FG(user_stream_current_filename) = NULL;`
`1764`	`1765`	`if (FG(stream_wrappers)) {`
`1765`	`1766`	`zend_hash_destroy(FG(stream_wrappers));`
`1766`	`1767`	`efree(FG(stream_wrappers));`