Skip to content

Commit 4a16cc1

Browse files
committed
ext/curl: Bump minimim Curl version to >= 7.61.0
Bumps the minimum required libcurl version to 7.61.0. Please also see #4917, which bumped minimum libcurl version to the current >= 7.29.0. Ubuntu, Debian, RHEL, and RHEL derivatives have major and LTS version bumps this year. Following are the libcurl-dev/libcurl-devel versions available in the oldest supported (LTS or otherwise) in major OSs. - Debian buster: [7.64](https://packages.debian.org/buster/libcurl4-openssl-dev) - Ubuntu 20.04: [7.68](https://packages.ubuntu.com/focal/libcurl-dev) - CentOS/RHEL 7: 7.29 - RHEL 8/Rocky 8/EL 8: 7.61 - Fedora 38: 7.87 RHEL/CentOS 7 reaches EOL mid 2024, so for PHP 8.4 scheduled towards the end of this year, we can safely bump the minimum libcurl version. 7.61.0 was selected as the new minimum because RHEL and derivatives have libcurl-devel version 7.61. RHEL 8 is a current and supported RHEL version.
1 parent b06fedb commit 4a16cc1

8 files changed

+2
-160
lines changed

ext/curl/config.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ PHP_ARG_WITH([curl],
44
[Include cURL support])])
55

66
if test "$PHP_CURL" != "no"; then
7-
PKG_CHECK_MODULES([CURL], [libcurl >= 7.29.0])
7+
PKG_CHECK_MODULES([CURL], [libcurl >= 7.61.0])
88
PKG_CHECK_VAR([CURL_FEATURES], [libcurl], [supported_features])
99

1010
PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)

ext/curl/curl.stub.php

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -472,13 +472,11 @@
472472
* @cvalue CURLOPT_WRITEHEADER
473473
*/
474474
const CURLOPT_WRITEHEADER = UNKNOWN;
475-
#if LIBCURL_VERSION_NUM >= 0x072000
476475
/**
477476
* @var int
478477
* @cvalue CURLOPT_XFERINFOFUNCTION
479478
*/
480479
const CURLOPT_XFERINFOFUNCTION = UNKNOWN;
481-
#endif
482480

483481
/* */
484482
/**
@@ -776,13 +774,11 @@
776774
* @cvalue CURLE_SSL_PEER_CERTIFICATE
777775
*/
778776
const CURLE_SSL_PEER_CERTIFICATE = UNKNOWN;
779-
#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
780777
/**
781778
* @var int
782779
* @cvalue CURLE_SSL_PINNEDPUBKEYNOTMATCH
783780
*/
784781
const CURLE_SSL_PINNEDPUBKEYNOTMATCH = UNKNOWN;
785-
#endif
786782
/**
787783
* @var int
788784
* @cvalue CURLE_TELNET_OPTION_SYNTAX
@@ -2421,7 +2417,6 @@
24212417
const CURLOPT_SASL_IR = UNKNOWN;
24222418
#endif
24232419

2424-
#if LIBCURL_VERSION_NUM >= 0x072100 /* Available since 7.33.0 */
24252420
/**
24262421
* @var int
24272422
* @cvalue CURLOPT_DNS_INTERFACE
@@ -2453,7 +2448,6 @@
24532448
* @cvalue CURL_VERSION_HTTP2
24542449
*/
24552450
const CURL_VERSION_HTTP2 = UNKNOWN;
2456-
#endif
24572451

24582452
#if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */
24592453
/**
@@ -2479,7 +2473,6 @@
24792473
const CURL_SSLVERSION_TLSv1_2 = UNKNOWN;
24802474
#endif
24812475

2482-
#if LIBCURL_VERSION_NUM >= 0x072400 /* Available since 7.36.0 */
24832476
/**
24842477
* @var int
24852478
* @cvalue CURLOPT_EXPECT_100_TIMEOUT_MS
@@ -2495,7 +2488,6 @@
24952488
* @cvalue CURLOPT_SSL_ENABLE_NPN
24962489
*/
24972490
const CURLOPT_SSL_ENABLE_NPN = UNKNOWN;
2498-
#endif
24992491

25002492
#if LIBCURL_VERSION_NUM >= 0x072500 /* Available since 7.37.0 */
25012493
/**
@@ -2520,7 +2512,6 @@
25202512
const CURLOPT_PROXYHEADER = UNKNOWN;
25212513
#endif
25222514

2523-
#if LIBCURL_VERSION_NUM >= 0x072600 /* Available since 7.38.0 */
25242515
/**
25252516
* @var int
25262517
* @cvalue CURLAUTH_NEGOTIATE
@@ -2531,7 +2522,6 @@
25312522
* @cvalue CURL_VERSION_GSSAPI
25322523
*/
25332524
const CURL_VERSION_GSSAPI = UNKNOWN;
2534-
#endif
25352525

25362526
#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
25372527
/**
@@ -2541,7 +2531,6 @@
25412531
const CURLOPT_PINNEDPUBLICKEY = UNKNOWN;
25422532
#endif
25432533

2544-
#if LIBCURL_VERSION_NUM >= 0x072800 /* Available since 7.40.0 */
25452534
/**
25462535
* @var int
25472536
* @cvalue CURLOPT_UNIX_SOCKET_PATH
@@ -2567,15 +2556,12 @@
25672556
* @cvalue CURL_VERSION_UNIX_SOCKETS
25682557
*/
25692558
const CURL_VERSION_UNIX_SOCKETS = UNKNOWN;
2570-
#endif
25712559

2572-
#if LIBCURL_VERSION_NUM >= 0x072900 /* Available since 7.41.0 */
25732560
/**
25742561
* @var int
25752562
* @cvalue CURLOPT_SSL_VERIFYSTATUS
25762563
*/
25772564
const CURLOPT_SSL_VERIFYSTATUS = UNKNOWN;
2578-
#endif
25792565

25802566
#if LIBCURL_VERSION_NUM >= 0x072a00 /* Available since 7.42.0 */
25812567
/**

ext/curl/curl_arginfo.h

Lines changed: 1 addition & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ext/curl/curl_private.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ typedef struct {
7373
php_curl_read *read;
7474
zval std_err;
7575
php_curl_callback *progress;
76-
#if LIBCURL_VERSION_NUM >= 0x072000
7776
php_curl_callback *xferinfo;
78-
#endif
7977
php_curl_callback *fnmatch;
8078
#if LIBCURL_VERSION_NUM >= 0x075400
8179
php_curl_callback *sshhostkey;

0 commit comments

Comments
 (0)