Re: svn: /php/php-src/branches/PHP_5_4/ext/zlib/ zlib.c
| From: | Hannes Magnusson | Date: | Tue, 27 Dec 2011 00:01:27 +0000 |
| Subject: | Re: svn: /php/php-src/branches/PHP_5_4/ext/zlib/ zlib.c | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-67337@lists.php.net to get a copy of this message | ||
trunk?
-Hannes
On Mon, Dec 26, 2011 at 23:53, Pierre Joye <pajoye@php.net> wrote:
> pajoye Mon, 26 Dec 2011 22:53:12 +0000
>
> Revision:
> http://svn.php.net/viewvc?view=revision&revision=321417
>
> Log:
> - Fix bug #60326, fix crash introduced by initial fix
>
> Bug: https://bugs.php.net/60326 (Assigned) ob_gzhander()
> removed
>
> Changed paths:
> U php/php-src/branches/PHP_5_4/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-12-26 20:03:46 UTC (rev
> 321416)
> +++ php/php-src/branches/PHP_5_4/ext/zlib/zlib.c 2011-12-26 22:53:12 UTC (rev
> 321417)
> @@ -938,7 +938,7 @@
> 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;
> }
> /* }}} */
> @@ -969,7 +969,6 @@
> static PHP_RSHUTDOWN_FUNCTION(zlib)
> {
> ZLIBG(output_compression) = 0;
> -
> php_zlib_cleanup_ob_gzhandler_mess(TSRMLS_C);
>
> return SUCCESS;
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php