Merge branch 'PHP-8.0' into PHP-8.1

dstogov · dstogov · commit f4afa9adc63a · 2022-09-12T11:39:18.000+03:00
* PHP-8.0:
  Reset FG(user_stream_current_filename) at the end of request
diff --git a/main/streams/streams.c b/main/streams/streams.c
@@ -1674,6 +1674,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
`@@ -1674,6 +1674,7 @@ static void stream_resource_persistent_dtor(zend_resource *rsrc)`
`1674`	`1674`
`1675`	`1675`	`void php_shutdown_stream_hashes(void)`
`1676`	`1676`	`{`
	`1677`	`+ FG(user_stream_current_filename) = NULL;`
`1677`	`1678`	`if (FG(stream_wrappers)) {`
`1678`	`1679`	`zend_hash_destroy(FG(stream_wrappers));`
`1679`	`1680`	`efree(FG(stream_wrappers));`