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

2011-12-26 Thread Pierre Joye 
pajoye   Tue, 27 Dec 2011 02:39:14 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=321420

Log:
- fix bug 60326, fix crash introduce by the fix

Bug: https://bugs.php.net/60326 (Assigned) ob_gzhander() removed
  
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   2011-12-27 02:13:55 UTC (rev 321419)
+++ php/php-src/trunk/ext/zlib/zlib.c   2011-12-27 02:39:14 UTC (rev 321420)
@@ -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;
 }
 /* }}} */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

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

2010-05-31 Thread Antony Dovgal 
tony2001 Mon, 31 May 2010 12:02:55 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=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

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

2009-12-09 Thread Jani Taskinen 
jani Wed, 09 Dec 2009 14:06:18 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=291920

Log:
- Rename badly named function

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   2009-12-09 13:54:37 UTC (rev 291919)
+++ php/php-src/trunk/ext/zlib/zlib.c   2009-12-09 14:06:18 UTC (rev 291920)
@@ -312,8 +312,8 @@
 }
 /* }}} */

-/* {{{ inflate_rounds() */
-static inline int inflate_rounds(z_stream *Z, size_t max, char **buf, size_t 
*len)
+/* {{{ php_zlib_inflate_rounds() */
+static inline int php_zlib_inflate_rounds(z_stream *Z, size_t max, char **buf, 
size_t *len)
 {
int status, round = 0;
php_zlib_buffer buffer = {NULL, NULL, 0, 0, 0};
@@ -374,7 +374,7 @@
Z.next_in = (Bytef *) in_buf;
Z.avail_in = in_len;

-   switch (status = inflate_rounds(Z, max_len, out_buf, 
out_len)) {
+   switch (status = php_zlib_inflate_rounds(Z, max_len, 
out_buf, out_len)) {
case Z_OK:
case Z_STREAM_END:
inflateEnd(Z);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

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

2009-08-03 Thread Jani Taskinen 
jani Mon, 03 Aug 2009 18:08:46 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=286749

Log:
- Fix output compression

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   2009-08-03 17:38:38 UTC (rev 286748)
+++ php/php-src/trunk/ext/zlib/zlib.c   2009-08-03 18:08:46 UTC (rev 286749)
@@ -70,7 +70,7 @@
if (!ZLIBG(compression_coding)) {
zend_is_auto_global(ZEND_STRL(_SERVER) TSRMLS_CC);

-   if (PG(http_globals)[TRACK_VARS_SERVER]  SUCCESS == 
zend_ascii_hash_find(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]), 
HTTP_ACCEPT_ENCODING, sizeof(HTTP_ACCEPT_ENCODING), (void *) enc)) {
+   if (PG(http_globals)[TRACK_VARS_SERVER]  SUCCESS == 
zend_hash_find(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]), 
HTTP_ACCEPT_ENCODING, sizeof(HTTP_ACCEPT_ENCODING), (void *) enc)) {
convert_to_string(*enc);
if (strstr(Z_STRVAL_PP(enc), gzip)) {
ZLIBG(compression_coding) = 
PHP_ZLIB_ENCODING_GZIP;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php