tony2001 Mon, 31 May 2010 12:02:55 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=299982
Log:
fix ZTS build
Changed paths:
U php/php-src/trunk/ext/zlib/zlib.c
Modified: php/php-src/trunk/ext/zlib/zlib.c
===================================================================
--- php/php-src/trunk/ext/zlib/zlib.c 2010-05-31 10:52:14 UTC (rev 299981)
+++ php/php-src/trunk/ext/zlib/zlib.c 2010-05-31 12:02:55 UTC (rev 299982)
@@ -791,9 +791,9 @@
php_register_url_stream_wrapper("compress.zlib",
&php_stream_gzip_wrapper TSRMLS_CC);
php_stream_filter_register_factory("zlib.*", &php_zlib_filter_factory
TSRMLS_CC);
- php_output_handler_alias_register(ZEND_STRL("ob_gzhandler"),
php_zlib_output_handler_init);
- php_output_handler_conflict_register(ZEND_STRL("ob_gzhandler"),
php_zlib_output_conflict_check);
-
php_output_handler_conflict_register(ZEND_STRL(PHP_ZLIB_OUTPUT_HANDLER_NAME),
php_zlib_output_conflict_check);
+ php_output_handler_alias_register(ZEND_STRL("ob_gzhandler"),
php_zlib_output_handler_init TSRMLS_CC);
+ php_output_handler_conflict_register(ZEND_STRL("ob_gzhandler"),
php_zlib_output_conflict_check TSRMLS_CC);
+
php_output_handler_conflict_register(ZEND_STRL(PHP_ZLIB_OUTPUT_HANDLER_NAME),
php_zlib_output_conflict_check TSRMLS_CC);
REGISTER_LONG_CONSTANT("FORCE_GZIP", PHP_ZLIB_ENCODING_GZIP,
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FORCE_DEFLATE", PHP_ZLIB_ENCODING_DEFLATE,
CONST_CS|CONST_PERSISTENT);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
