diff options
| author | Stanislav Malyshev <stas@php.net> | 2011-12-26 08:29:11 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2011-12-26 08:29:11 +0000 |
| commit | e665e01e880bb9bbfcff065825f4d6db48e5515b (patch) | |
| tree | b1cffae80a42ddf465b6b55ae8bec418e398eb00 /ext/zlib/php_zlib.h | |
| parent | f863d486d139e285ce5dd6e87e411f59b3b63f94 (diff) | |
| download | php-git-e665e01e880bb9bbfcff065825f4d6db48e5515b.tar.gz | |
fix bug #60326 - restore ob_gzhandler
Diffstat (limited to 'ext/zlib/php_zlib.h')
| -rw-r--r-- | ext/zlib/php_zlib.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h index 0b34198b4a..0235e93a73 100644 --- a/ext/zlib/php_zlib.h +++ b/ext/zlib/php_zlib.h @@ -13,7 +13,7 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | - | Stefan Röhrich <sr@linux.de> | + | Stefan R�hrich <sr@linux.de> | | Michael Wallner <mike@php.net> | +----------------------------------------------------------------------+ */ @@ -34,14 +34,6 @@ #define PHP_ZLIB_OUTPUT_HANDLER_NAME "zlib output compression" #define PHP_ZLIB_BUFFER_SIZE_GUESS(in_len) (((size_t) ((double) in_len * (double) 1.015)) + 10 + 8 + 4 + 1) -ZEND_BEGIN_MODULE_GLOBALS(zlib) - /* variables for transparent gzip encoding */ - int compression_coding; - long output_compression; - long output_compression_level; - char *output_handler; -ZEND_END_MODULE_GLOBALS(zlib); - typedef struct _php_zlib_buffer { char *data; char *aptr; @@ -55,6 +47,15 @@ typedef struct _php_zlib_context { php_zlib_buffer buffer; } php_zlib_context; +ZEND_BEGIN_MODULE_GLOBALS(zlib) + /* variables for transparent gzip encoding */ + int compression_coding; + long output_compression; + long output_compression_level; + char *output_handler; + php_zlib_context *ob_gzhandler; +ZEND_END_MODULE_GLOBALS(zlib); + php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC); extern php_stream_ops php_stream_gzio_ops; extern php_stream_wrapper php_stream_gzip_wrapper; |