diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/config.w32.h.in | 9 | ||||
| -rw-r--r-- | win32/build/confutils.js | 2 | ||||
| -rw-r--r-- | win32/build/default.manifest | 9 | ||||
| -rw-r--r-- | win32/build/libs_version.txt | 10 |
4 files changed, 14 insertions, 16 deletions
diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in index 8ed79b39e4..2a8297a144 100644 --- a/win32/build/config.w32.h.in +++ b/win32/build/config.w32.h.in @@ -22,15 +22,6 @@ #define PHP_PREFIX "@PREFIX@" #define PHP_SYSCONFDIR "@PREFIX@" -/* Enable / Disable crypt() function (default: enabled) */ -#define HAVE_CRYPT 1 -#define PHP_STD_DES_CRYPT 1 -#define PHP_EXT_DES_CRYPT 1 -#define PHP_MD5_CRYPT 1 -#define PHP_BLOWFISH_CRYPT 1 -#define PHP_SHA512_CRYPT 1 -#define PHP_SHA256_CRYPT 1 - /* PHP Runtime Configuration */ #define PHP_URL_FOPEN 1 #define USE_CONFIG_FILE 1 diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 46046e0129..eb3658b68c 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -2156,7 +2156,7 @@ function ADD_FLAG(name, flags, target) match can be done. This will also help to normalize flags and to not to insert duplicates. */ - if (curr_flags.indexOf(" " + flags) >= 0) { + if (curr_flags.indexOf(" " + flags) >= 0 || curr_flags.indexOf(flags + " ") >= 0) { return; } diff --git a/win32/build/default.manifest b/win32/build/default.manifest index 77b2a2165a..992f41c738 100644 --- a/win32/build/default.manifest +++ b/win32/build/default.manifest @@ -1,6 +1,13 @@ <?xml version='1.0' encoding='UTF-8' standalone='yes'?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" > - <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> + <security> + <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3"> + <requestedExecutionLevel level="asInvoker" uiAccess="false" /> + </requestedPrivileges> + </security> + </trustInfo> + <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> <application> <!-- Windows Vista --> <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> diff --git a/win32/build/libs_version.txt b/win32/build/libs_version.txt index 3d629fcbaa..978367feed 100644 --- a/win32/build/libs_version.txt +++ b/win32/build/libs_version.txt @@ -3,14 +3,14 @@ cclient-2007f freetype-2.6.2 icu-56.1 jpeglib-9a -libcurl-7.46.0 +libcurl-7.47.1 libiconv-1.14 libmcrypt-2.5.8 libmpir-2.7.2 -libpng-1.6.20 -libpq-9.4.5 -libssh2-1.6.0 +libpng-1.6.21 +libpq-9.5.1 +libssh2-1.7.0 libtidy-20090406 libxslt-1.1.28 libxml-2.9.3 -openssl-1.0.2f +openssl-1.0.2h |