[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/zlib/zlib.c trunk/ext/zlib/zlib.c
cataphract Wed, 07 Mar 2012 08:51:30 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=323988
Log:
- Tentative fix for bug #61306.
#cjones: Will update NEWS when confirmed it fixes the problem.
Bug: https://bugs.php.net/61306 (Assigned) Segfault at end of request
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.c2012-03-07 07:55:26 UTC
(rev 323987)
+++ php/php-src/branches/PHP_5_4/ext/zlib/zlib.c2012-03-07 08:51:30 UTC
(rev 323988)
@@ -938,7 +938,6 @@
REGISTER_LONG_CONSTANT(ZLIB_ENCODING_GZIP, PHP_ZLIB_ENCODING_GZIP,
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(ZLIB_ENCODING_DEFLATE,
PHP_ZLIB_ENCODING_DEFLATE, CONST_CS|CONST_PERSISTENT);
REGISTER_INI_ENTRIES();
- ZLIBG(ob_gzhandler) = NULL;
return SUCCESS;
}
/* }}} */
@@ -989,6 +988,13 @@
}
/* }}} */
+/* {{{ ZEND_MODULE_GLOBALS_CTOR */
+static ZEND_MODULE_GLOBALS_CTOR_D(zlib)
+{
+ zlib_globals-ob_gzhandler = NULL;
+}
+/* }}} */
+
/* {{{ php_zlib_module_entry */
zend_module_entry php_zlib_module_entry = {
STANDARD_MODULE_HEADER,
@@ -1001,9 +1007,9 @@
PHP_MINFO(zlib),
2.0,
PHP_MODULE_GLOBALS(zlib),
+ ZEND_MODULE_GLOBALS_CTOR_N(zlib),
NULL,
NULL,
- NULL,
STANDARD_MODULE_PROPERTIES_EX
};
/* }}} */
Modified: php/php-src/trunk/ext/zlib/zlib.c
===
--- php/php-src/trunk/ext/zlib/zlib.c 2012-03-07 07:55:26 UTC (rev 323987)
+++ php/php-src/trunk/ext/zlib/zlib.c 2012-03-07 08:51:30 UTC (rev 323988)
@@ -938,7 +938,6 @@
REGISTER_LONG_CONSTANT(ZLIB_ENCODING_GZIP, PHP_ZLIB_ENCODING_GZIP,
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(ZLIB_ENCODING_DEFLATE,
PHP_ZLIB_ENCODING_DEFLATE, CONST_CS|CONST_PERSISTENT);
REGISTER_INI_ENTRIES();
- ZLIBG(ob_gzhandler) = NULL;
return SUCCESS;
}
/* }}} */
@@ -990,6 +989,13 @@
}
/* }}} */
+/* {{{ ZEND_MODULE_GLOBALS_CTOR */
+static ZEND_MODULE_GLOBALS_CTOR_D(zlib)
+{
+ zlib_globals-ob_gzhandler = NULL;
+}
+/* }}} */
+
/* {{{ php_zlib_module_entry */
zend_module_entry php_zlib_module_entry = {
STANDARD_MODULE_HEADER,
@@ -1002,9 +1008,9 @@
PHP_MINFO(zlib),
2.0,
PHP_MODULE_GLOBALS(zlib),
+ ZEND_MODULE_GLOBALS_CTOR_N(zlib),
NULL,
NULL,
- NULL,
STANDARD_MODULE_PROPERTIES_EX
};
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/zlib/zlib.c trunk/ext/zlib/zlib.c
On 3/7/12 12:51 AM, Gustavo André dos Santos Lopes wrote: cataphract Wed, 07 Mar 2012 08:51:30 + Revision: http://svn.php.net/viewvc?view=revisionrevision=323988 Log: - Tentative fix for bug #61306. #cjones: Will update NEWS when confirmed it fixes the problem. Bug: https://bugs.php.net/61306 (Assigned) Segfault at end of request Changed paths: U php/php-src/branches/PHP_5_4/ext/zlib/zlib.c U php/php-src/trunk/ext/zlib/zlib.c LOL! My gut feel says that NEWS should be kept in sync whenever code changes. It doesn't seem technically difficult. Keeping NEWS up to date avoids any bus-factor or memory-loss situations. If a bug fix is reverted, it's trivial to update NEWS again. NEWS comments can say attempt to fix or unfinished if there is some temporary uncertainty about a fix. -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/zlib/zlib.c trunk/ext/zlib/zlib.c
On Mar 7, 2012, at 8:15 AM, Christopher Jones wrote: On 3/7/12 12:51 AM, Gustavo André dos Santos Lopes wrote: cataphract Wed, 07 Mar 2012 08:51:30 + Revision: http://svn.php.net/viewvc?view=revisionrevision=323988 Log: - Tentative fix for bug #61306. #cjones: Will update NEWS when confirmed it fixes the problem. Bug: https://bugs.php.net/61306 (Assigned) Segfault at end of request Changed paths: U php/php-src/branches/PHP_5_4/ext/zlib/zlib.c U php/php-src/trunk/ext/zlib/zlib.c LOL! My gut feel says that NEWS should be kept in sync whenever code changes. It doesn't seem technically difficult. Keeping NEWS up to date avoids any bus-factor or memory-loss situations. If a bug fix is reverted, it's trivial to update NEWS again. NEWS comments can say attempt to fix or unfinished if there is some temporary uncertainty about a fix. They don't call him Christopher NEWS Jones for nothin'. :) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/zlib/zlib.c trunk/ext/zlib/zlib.c
pajoye Mon, 26 Dec 2011 12:32:05 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=321411
Log:
- Fix bug #60326, fix TS build (introduced by r321406)
Bug: https://bugs.php.net/60326 (error getting bug information)
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.c2011-12-26 11:25:59 UTC
(rev 321410)
+++ php/php-src/branches/PHP_5_4/ext/zlib/zlib.c2011-12-26 12:32:05 UTC
(rev 321411)
@@ -432,7 +432,7 @@
{
if (ZLIBG(ob_gzhandler)) {
deflateEnd((ZLIBG(ob_gzhandler)-Z));
- php_zlib_output_handler_context_dtor(ZLIBG(ob_gzhandler));
+ php_zlib_output_handler_context_dtor(ZLIBG(ob_gzhandler)
TSRMLS_CC);
ZLIBG(ob_gzhandler) = NULL;
}
}
Modified: php/php-src/trunk/ext/zlib/zlib.c
===
--- php/php-src/trunk/ext/zlib/zlib.c 2011-12-26 11:25:59 UTC (rev 321410)
+++ php/php-src/trunk/ext/zlib/zlib.c 2011-12-26 12:32:05 UTC (rev 321411)
@@ -432,7 +432,7 @@
{
if (ZLIBG(ob_gzhandler)) {
deflateEnd((ZLIBG(ob_gzhandler)-Z));
- php_zlib_output_handler_context_dtor(ZLIBG(ob_gzhandler));
+ php_zlib_output_handler_context_dtor(ZLIBG(ob_gzhandler)
TSRMLS_CC);
ZLIBG(ob_gzhandler) = NULL;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/zlib/zlib.c trunk/ext/zlib/zlib.c
mike Mon, 19 Sep 2011 15:20:38 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=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.c2011-09-19 15:12:59 UTC
(rev 316995)
+++ php/php-src/branches/PHP_5_4/ext/zlib/zlib.c2011-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
