diff options
Diffstat (limited to 'ext/zlib')
| -rw-r--r-- | ext/zlib/php_zlib.h | 2 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 12 | ||||
| -rw-r--r-- | ext/zlib/zlib_fopen_wrapper.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h index f0732ded31..d4fe9af97d 100644 --- a/ext/zlib/php_zlib.h +++ b/ext/zlib/php_zlib.h @@ -64,7 +64,7 @@ PHP_FUNCTION(gzinflate); PHP_FUNCTION(gzencode); PHP_FUNCTION(ob_gzhandler); -FILE *zlib_fopen_wrapper(char *path, char *mode, int options, int *issock, int *socketd, char **opened_path); +FILE *zlib_fopen_wrapper(char *path, char *mode, int options, int *issock, int *socketd, char **opened_path TSRMLS_DC); int php_enable_output_compression(int buffer_size); diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index e70d9fa49d..45dee37364 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -165,7 +165,7 @@ PHP_MINIT_FUNCTION(zlib) #if HAVE_FOPENCOOKIE if(PG(allow_url_fopen)) { - php_register_url_wrapper("zlib",zlib_fopen_wrapper TSRMLS_CC); + php_register_url_wrapper("zlib", zlib_fopen_wrapper TSRMLS_CC); } #endif @@ -229,12 +229,12 @@ PHP_MINFO_FUNCTION(zlib) /* {{{ php_gzopen_wrapper */ -static gzFile php_gzopen_wrapper(char *path, char *mode, int options) +static gzFile php_gzopen_wrapper(char *path, char *mode, int options TSRMLS_DC) { FILE *f; int issock=0, socketd=0; - f = php_fopen_wrapper(path, mode, options, &issock, &socketd, NULL); + f = php_fopen_wrapper(path, mode, options, &issock, &socketd, NULL TSRMLS_CC); if (!f) { return NULL; @@ -272,7 +272,7 @@ PHP_FUNCTION(gzfile) } convert_to_string_ex(filename); - zp = php_gzopen_wrapper((*filename)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE); + zp = php_gzopen_wrapper((*filename)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE TSRMLS_CC); if (!zp) { php_error(E_WARNING,"gzFile(\"%s\") - %s",(*filename)->value.str.val,strerror(errno)); RETURN_FALSE; @@ -332,7 +332,7 @@ PHP_FUNCTION(gzopen) * We need a better way of returning error messages from * php_gzopen_wrapper(). */ - zp = php_gzopen_wrapper((*arg1)->value.str.val, p, use_include_path|ENFORCE_SAFE_MODE); + zp = php_gzopen_wrapper((*arg1)->value.str.val, p, use_include_path|ENFORCE_SAFE_MODE TSRMLS_CC); if (!zp) { php_error(E_WARNING,"gzopen(\"%s\",\"%s\") - %s", (*arg1)->value.str.val, p, strerror(errno)); @@ -640,7 +640,7 @@ PHP_FUNCTION(readgzfile) * We need a better way of returning error messages from * php_gzopen_wrapper(). */ - zp = php_gzopen_wrapper((*arg1)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE); + zp = php_gzopen_wrapper((*arg1)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE TSRMLS_CC); if (!zp){ php_error(E_WARNING,"ReadGzFile(\"%s\") - %s",(*arg1)->value.str.val,strerror(errno)); RETURN_FALSE; diff --git a/ext/zlib/zlib_fopen_wrapper.c b/ext/zlib/zlib_fopen_wrapper.c index ad87ba705f..f9328025eb 100644 --- a/ext/zlib/zlib_fopen_wrapper.c +++ b/ext/zlib/zlib_fopen_wrapper.c @@ -59,7 +59,7 @@ static COOKIE_IO_FUNCTIONS_T gz_cookie_functions = , gz_closer }; -FILE *zlib_fopen_wrapper(char *path, char *mode, int options, int *issock, int *socketd, char **opened_path) +FILE *zlib_fopen_wrapper(char *path, char *mode, int options, int *issock, int *socketd, char **opened_path TSRMLS_DC) { struct gz_cookie *gc = NULL; FILE *fp; @@ -75,7 +75,7 @@ FILE *zlib_fopen_wrapper(char *path, char *mode, int options, int *issock, int * path++; - fp = php_fopen_wrapper(path, mode, options|IGNORE_URL, &fissock, &fsocketd, NULL); + fp = php_fopen_wrapper(path, mode, options|IGNORE_URL, &fissock, &fsocketd, NULL TSRMLS_CC); if (!fp) { free(gc); |