diff options
| author | Sean Finney <seanius@debian.org> | 2010-02-07 22:19:53 +0100 |
|---|---|---|
| committer | Sean Finney <seanius@debian.org> | 2010-02-07 22:27:07 +0100 |
| commit | c852c28a88fccf6e34a2cb091fdfa72bce2b59c7 (patch) | |
| tree | 91f01b0d06916c78262404096bfd466b8e95e5b5 /ext/zip/php_zip.h | |
| parent | 176cbd0bc99e20bb21f92f0b72df728eafc1e2ce (diff) | |
| parent | 0fab6db7cac8d2be99579dd049f812a8ff98e74f (diff) | |
| download | php-c852c28a88fccf6e34a2cb091fdfa72bce2b59c7.tar.gz | |
Merge branch 'upstream-experimental' into upstream-sid
Diffstat (limited to 'ext/zip/php_zip.h')
| -rw-r--r-- | ext/zip/php_zip.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h index a3b854f3c..e75c11814 100644 --- a/ext/zip/php_zip.h +++ b/ext/zip/php_zip.h @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_zip.h 275233 2009-02-05 19:53:22Z pajoye $ */ +/* $Id: php_zip.h 272370 2008-12-31 11:15:49Z sebastian $ */ #ifndef PHP_ZIP_H #define PHP_ZIP_H @@ -24,11 +24,13 @@ extern zend_module_entry zip_module_entry; #define phpext_zip_ptr &zip_module_entry +#ifdef ZTS #include "TSRM.h" +#endif #include "lib/zip.h" -#define PHP_ZIP_VERSION_STRING "1.8.11" +#define PHP_ZIP_VERSION_STRING "1.9.1" #if ((PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 2) || PHP_MAJOR_VERSION >= 6) # define PHP_ZIP_USE_OO 1 @@ -43,9 +45,9 @@ extern zend_module_entry zip_module_entry; /* {{{ OPENBASEDIR_CHECKPATH(filename) */ #if (PHP_MAJOR_VERSION < 6) -#define OPENBASEDIR_CHECKPATH(filename) \ +# define OPENBASEDIR_CHECKPATH(filename) \ (PG(safe_mode) && (!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(filename TSRMLS_CC) -#else +#else #define OPENBASEDIR_CHECKPATH(filename) \ php_check_open_basedir(filename TSRMLS_CC) #endif |