com php-src: Fixed bug #75143 new method setEncryptionName() seems not to exist in ZipArchive: NEWS ext/zip/config.w32
| From: | Anatol Belski | Date: | Fri, 01 Sep 2017 08:53:09 +0000 |
| Subject: | com php-src: Fixed bug #75143 new method setEncryptionName() seems not to exist in ZipArchive: NEWS ext/zip/config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-99226@lists.php.net to get a copy of this message | ||
Commit: a6456f0a6cf33565c21f7d691c0f6672b7bc64b7
Author: Anatol Belski <ab@php.net> Fri, 1 Sep 2017 10:49:06 +0200
Parents: fb597a8123b6d4912d52cf116dca195761dac327
Branches: PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a6456f0a6cf33565c21f7d691c0f6672b7bc64b7
Log:
Fixed bug #75143 new method setEncryptionName() seems not to exist in ZipArchive
update NEWS
Bugs:
https://bugs.php.net/75143
Changed paths:
M NEWS
M ext/zip/config.w32
Diff:
diff --git a/NEWS b/NEWS
index 3005573..95612e3 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,10 @@ PHP NEWS
- OpenSSL
.. Automatically load OpenSSL configuration file. (Jakub Zelenka)
+- ZIP:
+ . Fixed bug #75143 (new method setEncryptionName() seems not to exist
+ in ZipArchive). (Anatol)
+
31 Aug 2017, PHP 7.2.0RC1
- Core:
diff --git a/ext/zip/config.w32 b/ext/zip/config.w32
index 4a41075..906b65f 100644
--- a/ext/zip/config.w32
+++ b/ext/zip/config.w32
@@ -16,7 +16,7 @@ if (PHP_ZIP != "no") {
AC_DEFINE('HAVE_ZIP', 1);
AC_DEFINE('HAVE_LIBZIP', 1);
- ADD_FLAG("CFLAGS_ZIP", "/D _WIN32");
+ ADD_FLAG("CFLAGS_ZIP", "/D _WIN32 /D HAVE_ENCRYPTION");
} else if (CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS_ZIP",
"..\\zlib;" + PHP_ZIP) &&
CHECK_HEADER_ADD_INCLUDE("zipconf.h", "CFLAGS_ZIP", configure_module_dirname
+ "\\lib;" + PHP_ZIP) &&
(((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib", "zip",
PHP_ZIP) || CHECK_LIB("zlib.lib", "zip", PHP_ZIP))) ||