diff options
| author | Zeev Suraski <zeev@php.net> | 2002-08-23 08:37:35 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2002-08-23 08:37:35 +0000 |
| commit | a6e8e723728a1b8976e9a24e77abe3e0b3e6c294 (patch) | |
| tree | e64eaeb7725380f2230b8d0fe849e90cc31d839c /ext | |
| parent | 03b1204a8a9adb725998d5e77e7074866dca12bc (diff) | |
| download | php-git-a6e8e723728a1b8976e9a24e77abe3e0b3e6c294.tar.gz | |
Fix ob_gzhandler()'s handling of requests w/o compression but that do have
the Accept-Encoding header
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/zlib/zlib.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 312178e180..2c52b9a039 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -905,11 +905,8 @@ PHP_FUNCTION(ob_gzhandler) || 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) { - /* return the original string */ - *return_value = **zv_string; - zval_copy_ctor(return_value); ZLIBG(ob_gzhandler_status)=-1; - return; + RETURN_FALSE; } convert_to_string_ex(a_encoding); if (php_memnstr(Z_STRVAL_PP(a_encoding), "gzip", 4, Z_STRVAL_PP(a_encoding) + Z_STRLEN_PP(a_encoding))) { @@ -917,6 +914,7 @@ PHP_FUNCTION(ob_gzhandler) } else if(php_memnstr(Z_STRVAL_PP(a_encoding), "deflate", 7, Z_STRVAL_PP(a_encoding) + Z_STRLEN_PP(a_encoding))) { coding = CODING_DEFLATE; } else { + ZLIBG(ob_gzhandler_status)=-1; RETURN_FALSE; } |