From a1ba3007a452fb2618526ed7159236362219a208 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 5 Sep 2018 17:40:25 +0200 Subject: [PATCH] Sync with recent changes to default libcurl build --- ext/curl/config.w32 | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/ext/curl/config.w32 b/ext/curl/config.w32 index dfb6e33e81c..b2376a46232 100644 --- a/ext/curl/config.w32 +++ b/ext/curl/config.w32 @@ -3,13 +3,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');