diff options
Diffstat (limited to 'ext/zip/php_zip.h')
| -rw-r--r-- | ext/zip/php_zip.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h index 92374b00b..2eaf568d0 100644 --- a/ext/zip/php_zip.h +++ b/ext/zip/php_zip.h @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_zip.h 293036 2010-01-03 09:23:27Z sebastian $ */ +/* $Id: php_zip.h 298626 2010-04-26 23:55:03Z kalle $ */ #ifndef PHP_ZIP_H #define PHP_ZIP_H @@ -43,12 +43,12 @@ extern zend_module_entry zip_module_entry; # endif #endif -/* {{{ OPENBASEDIR_CHECKPATH(filename) */ -#if (PHP_MAJOR_VERSION < 6) -# define OPENBASEDIR_CHECKPATH(filename) \ +/* {{{ ZIP_OPENBASEDIR_CHECKPATH(filename) */ +#if PHP_API_VERSION < 20100412 +# define ZIP_OPENBASEDIR_CHECKPATH(filename) \ (PG(safe_mode) && (!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(filename TSRMLS_CC) #else -#define OPENBASEDIR_CHECKPATH(filename) \ +#define ZIP_OPENBASEDIR_CHECKPATH(filename) \ php_check_open_basedir(filename TSRMLS_CC) #endif /* }}} */ |