diff options
| author | Stefan Roehrich <sr@php.net> | 2003-08-24 13:32:50 +0000 |
|---|---|---|
| committer | Stefan Roehrich <sr@php.net> | 2003-08-24 13:32:50 +0000 |
| commit | 8828e17a4461653ddd0d667c0598292b5ef5f8df (patch) | |
| tree | 7ce51f4c9a6daf817406282f56201f7a5b1bd921 | |
| parent | d3473d1f58c3801805ceac5c6c7df839d12c2a04 (diff) | |
| download | php-git-8828e17a4461653ddd0d667c0598292b5ef5f8df.tar.gz | |
Fixed zlib.output_compression without register_long_vars set.
| -rw-r--r-- | ext/zlib/zlib.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 6117a56608..752601414e 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -1046,11 +1046,12 @@ static void php_gzip_output_handler(char *output, uint output_len, char **handle */ 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; } |