Skip to content

Commit 07a3719

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Fix GH-17855: CURL_STATICLIB flag set even if linked with shared lib
2 parents 77847b0 + 29c39a3 commit 07a3719

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ PHP NEWS
7575

7676
- Windows:
7777
. Fixed phpize for Windows 11 (24H2). (bwoebi)
78+
. Fixed GH-17855 (CURL_STATICLIB flag set even if linked with shared lib).
79+
(cmb)
7880

7981
- Zlib:
8082
. Fixed bug GH-17745 (zlib extension incorrectly handles object arguments).

ext/curl/config.w32

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ if (PHP_CURL != "no") {
1313
}
1414
}
1515

16-
if (CHECK_LIB("libcurl_a.lib;libcurl.lib", "curl", PHP_CURL) &&
16+
var curl_location;
17+
if ((curl_location = CHECK_LIB("libcurl_a.lib;libcurl.lib", "curl", PHP_CURL)) &&
1718
CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_CURL") &&
1819
SETUP_OPENSSL("curl", PHP_CURL) >= 2 &&
1920
CHECK_LIB("winmm.lib", "curl", PHP_CURL) &&
@@ -27,7 +28,10 @@ if (PHP_CURL != "no") {
2728
) {
2829
EXTENSION("curl", "interface.c multi.c share.c curl_file.c");
2930
AC_DEFINE('HAVE_CURL', 1, "Define to 1 if the PHP extension 'curl' is available.");
30-
ADD_FLAG("CFLAGS_CURL", "/D CURL_STATICLIB /D PHP_CURL_EXPORTS=1");
31+
ADD_FLAG("CFLAGS_CURL", "/D PHP_CURL_EXPORTS=1");
32+
if (curl_location.match(/libcurl_a\.lib$/)) {
33+
ADD_FLAG("CFLAGS_CURL", "/D CURL_STATICLIB");
34+
}
3135
PHP_INSTALL_HEADERS("ext/curl", "php_curl.h");
3236
} else {
3337
WARNING("curl not enabled; libraries and headers not found");

0 commit comments

Comments
 (0)