Skip to content

Commit 94a12d5

Browse files
authored
ext/curl: Cleanup config.w32 to remove superfluous checks and outdated comments (#13684)
- Remove a check for an always-true curl version check - Remove a `TODO` comment for curl_version_info check that should be always available since libcurl 7.10
1 parent 18dffa6 commit 94a12d5

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

ext/curl/config.w32

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,14 @@ if (PHP_CURL != "no") {
2121
(((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "curl", PHP_CURL))) ||
2222
(PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "curl", PHP_CURL)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) &&
2323
!isNaN(ver_num) &&
24-
(ver_num <= parseInt("0x073b00") || ver_num > parseInt("0x073b00") &&
25-
CHECK_LIB("normaliz.lib", "curl", PHP_CURL) &&
26-
CHECK_LIB("libssh2.lib", "curl", PHP_CURL) &&
27-
CHECK_LIB("nghttp2.lib", "curl", PHP_CURL))
24+
(CHECK_LIB("normaliz.lib", "curl", PHP_CURL) &&
25+
CHECK_LIB("libssh2.lib", "curl", PHP_CURL) &&
26+
CHECK_LIB("nghttp2.lib", "curl", PHP_CURL))
2827
) {
2928
EXTENSION("curl", "interface.c multi.c share.c curl_file.c");
3029
AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');
3130
ADD_FLAG("CFLAGS_CURL", "/D CURL_STATICLIB /D PHP_CURL_EXPORTS=1");
3231
PHP_INSTALL_HEADERS("ext/curl", "php_curl.h");
33-
// TODO: check for curl_version_info
3432
} else {
3533
WARNING("curl not enabled; libraries and headers not found");
3634
}

0 commit comments

Comments
 (0)