[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/zlib/zlib.c trunk/ext/zlib/zlib.c

[Pierre Joye]

pajoye                                   Mon, 26 Dec 2011 12:32:05 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=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.c        2011-12-26 11:25:59 UTC 
(rev 321410)
+++ php/php-src/branches/PHP_5_4/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;
        }
 }

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