sr Sun Aug 24 09:32:51 2003 EDT
Modified files:
/php-src/ext/zlib zlib.c
Log:
Fixed zlib.output_compression without register_long_vars set.
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.175 php-src/ext/zlib/zlib.c:1.176
--- php-src/ext/zlib/zlib.c:1.175 Sun Aug 10 21:56:43 2003
+++ php-src/ext/zlib/zlib.c Sun Aug 24 09:32:50 2003
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zlib.c,v 1.175 2003/08/11 01:56:43 sniper Exp $ */
+/* $Id: zlib.c,v 1.176 2003/08/24 13:32:50 sr Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1046,11 +1046,12 @@
*/
int php_enable_output_compression(int buffer_size TSRMLS_DC)
{
- zval **a_encoding, **data;
+ zval **a_encoding;
- if (zend_hash_find(&EG(symbol_table), "HTTP_SERVER_VARS",
sizeof("HTTP_SERVER_VARS"), (void **) &data) == FAILURE
- || Z_TYPE_PP(data) != IS_ARRAY
- || zend_hash_find(Z_ARRVAL_PP(data), "HTTP_ACCEPT_ENCODING",
sizeof("HTTP_ACCEPT_ENCODING"), (void **) &a_encoding) == FAILURE
+ zend_is_auto_global("_SERVER", sizeof("_SERVER")-1 TSRMLS_CC);
+
+ if (!PG(http_globals)[TRACK_VARS_SERVER]
+ || zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht,
"HTTP_ACCEPT_ENCODING", sizeof("HTTP_ACCEPT_ENCODING"), (void **) &a_encoding) ==
FAILURE
) {
return FAILURE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
