From db99b877f0d5fc29b298021ef401acd196062d7d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Sep 2015 14:04:20 +0200 Subject: ext/zip version is now 1.13.0 --- ext/zip/php_zip.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/zip/php_zip.h') diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h index 1ac775eebf..628ab5d445 100644 --- a/ext/zip/php_zip.h +++ b/ext/zip/php_zip.h @@ -38,7 +38,7 @@ extern zend_module_entry zip_module_entry; #define ZIP_OVERWRITE ZIP_TRUNCATE #endif -#define PHP_ZIP_VERSION "1.13.0dev" +#define PHP_ZIP_VERSION "1.13.0" #ifndef Z_SET_REFCOUNT_P # if PHP_MAJOR_VERSION < 6 && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 3) -- cgit v1.2.1 From 49493a2dcfb2cd1758b69b13d9006ead3be0e066 Mon Sep 17 00:00:00 2001 From: Lior Kaplan Date: Fri, 1 Jan 2016 19:19:27 +0200 Subject: Happy new year (Update copyright to 2016) --- ext/zip/php_zip.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/zip/php_zip.h') diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h index d5ec6f6a0c..73fa9e114f 100644 --- a/ext/zip/php_zip.h +++ b/ext/zip/php_zip.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | -- cgit v1.2.1 From 93dc91b386b53bdd317ea6abd70640e2bbfbaf73 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 30 Jan 2016 14:56:17 +0100 Subject: Remove version checks PHP_VERSION_ID PHP_API_VERSION ZEND_MODULE_API_NO PHP_MAJOR_VERSION, PHP_MINOR_VERSION ZEND_ENGINE_2 I've left litespeed alone, as it seems to genuinely maintain support for many PHP versions. --- ext/zip/php_zip.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'ext/zip/php_zip.h') diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h index 602b1b1c44..98655e70cc 100644 --- a/ext/zip/php_zip.h +++ b/ext/zip/php_zip.h @@ -40,22 +40,7 @@ extern zend_module_entry zip_module_entry; #define PHP_ZIP_VERSION "1.13.0" -#ifndef Z_SET_REFCOUNT_P -# if PHP_MAJOR_VERSION < 6 && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 3) -# define Z_SET_REFCOUNT_P(pz, rc) pz->refcount = rc -# define Z_UNSET_ISREF_P(pz) pz->is_ref = 0 -# endif -#endif - -/* {{{ 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) -#else -#define ZIP_OPENBASEDIR_CHECKPATH(filename) \ - php_check_open_basedir(filename) -#endif -/* }}} */ +#define ZIP_OPENBASEDIR_CHECKPATH(filename) php_check_open_basedir(filename) typedef struct _ze_zip_rsrc { struct zip *za; -- cgit v1.2.1 From d20f1d8f1f6a238cb290f5ccab2de1ac3dcaa03a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 22 Feb 2016 09:26:00 +0100 Subject: cleanup $Id --- ext/zip/php_zip.h | 1 - 1 file changed, 1 deletion(-) (limited to 'ext/zip/php_zip.h') diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h index 73fa9e114f..657f178891 100644 --- a/ext/zip/php_zip.h +++ b/ext/zip/php_zip.h @@ -16,7 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ #ifndef PHP_ZIP_H #define PHP_ZIP_H -- cgit v1.2.1 From 0d57c06b2c02678eeb724ea512b8ce4c85a339b2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 22 Feb 2016 18:18:30 +0100 Subject: update bundled libzip to 1.1.2 --- ext/zip/php_zip.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/zip/php_zip.h') diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h index ceedfce572..f5df19e79a 100644 --- a/ext/zip/php_zip.h +++ b/ext/zip/php_zip.h @@ -37,7 +37,7 @@ extern zend_module_entry zip_module_entry; #define ZIP_OVERWRITE ZIP_TRUNCATE #endif -#define PHP_ZIP_VERSION "1.13.0" +#define PHP_ZIP_VERSION "1.13.2" #ifndef Z_SET_REFCOUNT_P # if PHP_MAJOR_VERSION < 6 && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 3) -- cgit v1.2.1