diff options
| author | Anatol Belski <ab@php.net> | 2018-09-05 21:29:53 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-09-05 21:29:53 +0200 |
| commit | b323e1e8d07f655756b4ecb23e45cc424c0a9937 (patch) | |
| tree | c0e715a34a090a27cb0ff3fc03a1d42b2aafcb12 | |
| parent | 7a2c9585c47a9ddcff0cb8246d4981e086528877 (diff) | |
| parent | 28c6125053fa1b13bc88644f0e576ad620e1f0fb (diff) | |
| download | php-git-b323e1e8d07f655756b4ecb23e45cc424c0a9937.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Sync with recent changes to default libcurl build
| -rw-r--r-- | ext/curl/config.w32 | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/ext/curl/config.w32 b/ext/curl/config.w32 index d900d48c41..112e5ea8f4 100644 --- a/ext/curl/config.w32 +++ b/ext/curl/config.w32 @@ -4,13 +4,28 @@ ARG_WITH("curl", "cURL support", "no"); if (PHP_CURL != "no") { + var ver_num = NaN; + var f = PHP_PHP_BUILD + "/include/curl/curlver.h"; + if (FSO.FileExists(f)) { + var reg = /LIBCURL_VERSION_NUM\s+(0x[a-z0-9]+)/gi; + var m = reg.exec(file_get_contents(PHP_PHP_BUILD + "/include/curl/curlver.h")); + if (!!m && m.length >= 2) { + ver_num = parseInt(m[1]); + } + } + if (CHECK_LIB("libcurl_a.lib;libcurl.lib", "curl", PHP_CURL) && CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_CURL") && SETUP_OPENSSL("curl", PHP_CURL) > 0 && CHECK_LIB("winmm.lib", "curl", PHP_CURL) && CHECK_LIB("wldap32.lib", "curl", PHP_CURL) && (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "curl", PHP_CURL))) || - (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "curl", PHP_CURL)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) + (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "curl", PHP_CURL)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) && + !isNaN(ver_num) && + (ver_num <= parseInt("0x073b00") || ver_num > parseInt("0x073b00") && + CHECK_LIB("normaliz.lib", "curl", PHP_CURL) && + CHECK_LIB("libssh2.lib", "curl", PHP_CURL) && + CHECK_LIB("nghttp2.lib", "curl", PHP_CURL)) ) { EXTENSION("curl", "interface.c multi.c share.c curl_file.c"); AC_DEFINE('HAVE_CURL', 1, 'Have cURL library'); |