diff options
Diffstat (limited to 'ext/zlib/php_zlib.h')
| -rw-r--r-- | ext/zlib/php_zlib.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h index 7e27c8b894..c24f32e007 100644 --- a/ext/zlib/php_zlib.h +++ b/ext/zlib/php_zlib.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ @@ -23,6 +23,9 @@ #ifndef PHP_ZLIB_H #define PHP_ZLIB_H +#include "php_version.h" +#define PHP_ZLIB_VERSION PHP_VERSION + #include <zlib.h> #define PHP_ZLIB_ENCODING_RAW -0xf @@ -44,21 +47,25 @@ typedef struct _php_zlib_buffer { typedef struct _php_zlib_context { z_stream Z; + char *inflateDict; + size_t inflateDictlen; 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; + zend_long output_compression; + zend_long output_compression_level; char *output_handler; php_zlib_context *ob_gzhandler; - long output_compression_default; - zend_bool handler_registered; + zend_long output_compression_default; + zend_bool handler_registered; + int compression_coding; ZEND_END_MODULE_GLOBALS(zlib); -php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, const char *path, const char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC); +#define ZLIBG(v) ZEND_MODULE_GLOBALS_ACCESSOR(zlib, v) + +php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, const char *path, const char *mode, int options, zend_string **opened_path, php_stream_context *context STREAMS_DC); extern php_stream_ops php_stream_gzio_ops; extern php_stream_wrapper php_stream_gzip_wrapper; extern php_stream_filter_factory php_zlib_filter_factory; @@ -66,13 +73,6 @@ extern zend_module_entry php_zlib_module_entry; #define zlib_module_ptr &php_zlib_module_entry #define phpext_zlib_ptr zlib_module_ptr -#ifdef ZTS -# include "TSRM.h" -# define ZLIBG(v) TSRMG(zlib_globals_id, zend_zlib_globals *, v) -#else -# define ZLIBG(v) (zlib_globals.v) -#endif - #endif /* PHP_ZLIB_H */ /* |