mike Mon, 19 Sep 2011 15:20:38 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=316996
Log:
fix r316992
Changed paths:
U php/php-src/branches/PHP_5_4/ext/zlib/zlib.c
U php/php-src/trunk/ext/zlib/zlib.c
Modified: php/php-src/branches/PHP_5_4/ext/zlib/zlib.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/zlib/zlib.c 2011-09-19 15:12:59 UTC
(rev 316995)
+++ php/php-src/branches/PHP_5_4/ext/zlib/zlib.c 2011-09-19 15:20:38 UTC
(rev 316996)
@@ -847,7 +847,6 @@
/* {{{ PHP_RINIT_FUNCTION */
static PHP_RINIT_FUNCTION(zlib)
{
- ZLIBG(output_compression) = 0;
ZLIBG(compression_coding) = 0;
php_zlib_output_compression_start(TSRMLS_C);
@@ -856,6 +855,13 @@
}
/* }}} */
+static PHP_RSHUTDOWN_FUNCTION(zlib)
+{
+ ZLIBG(output_compression) = 0;
+
+ return SUCCESS;
+}
+
/* {{{ PHP_MINFO_FUNCTION */
static PHP_MINFO_FUNCTION(zlib)
{
@@ -879,7 +885,7 @@
PHP_MINIT(zlib),
PHP_MSHUTDOWN(zlib),
PHP_RINIT(zlib),
- NULL,
+ PHP_RSHUTDOWN(zlib),
PHP_MINFO(zlib),
"2.0",
PHP_MODULE_GLOBALS(zlib),
Modified: php/php-src/trunk/ext/zlib/zlib.c
===================================================================
--- php/php-src/trunk/ext/zlib/zlib.c 2011-09-19 15:12:59 UTC (rev 316995)
+++ php/php-src/trunk/ext/zlib/zlib.c 2011-09-19 15:20:38 UTC (rev 316996)
@@ -847,7 +847,6 @@
/* {{{ PHP_RINIT_FUNCTION */
static PHP_RINIT_FUNCTION(zlib)
{
- ZLIBG(output_compression) = 0;
ZLIBG(compression_coding) = 0;
php_zlib_output_compression_start(TSRMLS_C);
@@ -856,6 +855,13 @@
}
/* }}} */
+static PHP_RSHUTDOWN_FUNCTION(zlib)
+{
+ ZLIBG(output_compression) = 0;
+
+ return SUCCESS;
+}
+
/* {{{ PHP_MINFO_FUNCTION */
static PHP_MINFO_FUNCTION(zlib)
{
@@ -879,7 +885,7 @@
PHP_MINIT(zlib),
PHP_MSHUTDOWN(zlib),
PHP_RINIT(zlib),
- NULL,
+ PHP_RSHUTDOWN(zlib),
PHP_MINFO(zlib),
"2.0",
PHP_MODULE_GLOBALS(zlib),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
