Attachment 295358 Details for Bug 433558 – patch backported to php-4.3.9

[patch] patch backported to php-4.3.9

php-stream-free.patch (text/plain), 2.00 KB, created by David Robinson on 2008-02-20 00:03:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Robinson

Created: 2008-02-20 00:03:04 UTC

Size: 2.00 KB

patch

obsolete

>--- php-4.3.9/ext/standard/basic_functions.c.dr	2008-02-20 09:11:18.000000000 +1000
>+++ php-4.3.9/ext/standard/basic_functions.c	2008-02-20 09:13:37.000000000 +1000
>@@ -1227,11 +1227,11 @@
> 	}
> 	STR_FREE(BG(locale_string));
> 
>-	if (FG(stream_wrappers)) {
>-		zend_hash_destroy(FG(stream_wrappers));
>-		efree(FG(stream_wrappers));
>-		FG(stream_wrappers) = NULL;
>- 	}
>+	/*
>+	  FG(stream_wrappers) are destroyed
>+	  during php_request_shutdown()
>+	  FG(stream_wrappers) = NULL;
>+	*/
> 
> 	PHP_RSHUTDOWN(fsock) (SHUTDOWN_FUNC_ARGS_PASSTHRU);
> 	PHP_RSHUTDOWN(filestat) (SHUTDOWN_FUNC_ARGS_PASSTHRU);
>--- php-4.3.9/main/main.c.dr	2008-02-20 09:07:06.000000000 +1000
>+++ php-4.3.9/main/main.c	2008-02-20 09:08:43.000000000 +1000
>@@ -1011,6 +1011,10 @@
> 		sapi_deactivate(TSRMLS_C);
> 	} zend_end_try();
> 
>+	zend_try {
>+		php_shutdown_stream_hashes(TSRMLS_C);
>+	} zend_end_try();
>+
> 	zend_try { 
> 		shutdown_memory_manager(CG(unclean_shutdown), 0 TSRMLS_CC);
> 	} zend_end_try();
>--- php-4.3.9/main/streams.c.dr	2008-02-20 09:09:13.000000000 +1000
>+++ php-4.3.9/main/streams.c	2008-02-20 09:10:45.000000000 +1000
>@@ -2327,6 +2327,15 @@
> 	FG(pclose_ret) = php_stream_free(stream, PHP_STREAM_FREE_CLOSE | PHP_STREAM_FREE_RSRC_DTOR);
> }
> 
>+void php_shutdown_stream_hashes(TSRMLS_D)
>+{
>+	if (FG(stream_wrappers)) {
>+		zend_hash_destroy(FG(stream_wrappers));
>+		efree(FG(stream_wrappers));
>+		FG(stream_wrappers) = NULL;
>+	}
>+}
>+
> int php_init_stream_wrappers(int module_number TSRMLS_DC)
> {
> 	le_stream = zend_register_list_destructors_ex(stream_resource_regular_dtor, NULL, "stream", module_number);
>--- php-4.3.9/main/php_streams.h.dr	2008-02-20 09:18:33.000000000 +1000
>+++ php-4.3.9/main/php_streams.h	2008-02-20 09:18:57.000000000 +1000
>@@ -526,6 +526,7 @@
> 
> int php_init_stream_wrappers(int module_number TSRMLS_DC);
> int php_shutdown_stream_wrappers(int module_number TSRMLS_DC);
>+void php_shutdown_stream_hashes(TSRMLS_D);
> PHP_RSHUTDOWN_FUNCTION(streams);
> 
> PHPAPI int php_register_url_stream_wrapper(char *protocol, php_stream_wrapper *wrapper TSRMLS_DC);

Actions: View | Diff

Attachments on bug 433558: 295358 | 295359