ext/curl: Bump minimum Curl version to >= 7.61.0

NEWS

@@ -14,6 +14,7 @@ Core:
 
 Curl:
   . Deprecated the CURLOPT_BINARYTRANSFER constant. (divinity76)
+  . Bumped required libcurl version to 7.61.0. (Ayesh)
 
 Date:
   . Added DateTime[Immutable]::createFromTimestamp. (Marc Bennewitz)

UPGRADING

@@ -392,6 +392,9 @@ PDO_SQLITE:
 9. Other Changes to Extensions
 ========================================
 
+- Curl:
+  . The Curl extension now requires at least libcurl 7.61.0.
+
 - Intl:
   . The class constants are typed now.
 

ext/curl/config.m4

@@ -4,7 +4,7 @@ PHP_ARG_WITH([curl],
     [Include cURL support])])
 
 if test "$PHP_CURL" != "no"; then
-  PKG_CHECK_MODULES([CURL], [libcurl >= 7.29.0])
+  PKG_CHECK_MODULES([CURL], [libcurl >= 7.61.0])
   PKG_CHECK_VAR([CURL_FEATURES], [libcurl], [supported_features])
 
   PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)

ext/curl/curl.stub.php

@@ -472,13 +472,11 @@
  * @cvalue CURLOPT_WRITEHEADER
  */
 const CURLOPT_WRITEHEADER = UNKNOWN;
-#if LIBCURL_VERSION_NUM >= 0x072000
 /**
  * @var int
  * @cvalue CURLOPT_XFERINFOFUNCTION
  */
 const CURLOPT_XFERINFOFUNCTION = UNKNOWN;
-#endif
 
 /* */
 /**
@@ -776,13 +774,11 @@
  * @cvalue CURLE_SSL_PEER_CERTIFICATE
  */
 const CURLE_SSL_PEER_CERTIFICATE = UNKNOWN;
-#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
 /**
  * @var int
  * @cvalue CURLE_SSL_PINNEDPUBKEYNOTMATCH
  */
 const CURLE_SSL_PINNEDPUBKEYNOTMATCH = UNKNOWN;
-#endif
 /**
  * @var int
  * @cvalue CURLE_TELNET_OPTION_SYNTAX
@@ -998,13 +994,11 @@
  * @cvalue CURLM_OUT_OF_MEMORY
  */
 const CURLM_OUT_OF_MEMORY = UNKNOWN;
-#if LIBCURL_VERSION_NUM >= 0x072001 /* Available since 7.32.1 */
 /**
  * @var int
  * @cvalue CURLM_ADDED_ALREADY
  */
 const CURLM_ADDED_ALREADY = UNKNOWN;
-#endif
 
 /* Curl proxy constants */
 /**
@@ -2385,7 +2379,6 @@
  */
 const CURLSSH_AUTH_AGENT = UNKNOWN;
 
-#if LIBCURL_VERSION_NUM >= 0x071e00 /* Available since 7.30.0 */
 /**
  * @var int
  * @cvalue CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE
@@ -2411,17 +2404,13 @@
  * @cvalue CURLMOPT_MAX_TOTAL_CONNECTIONS
  */
 const CURLMOPT_MAX_TOTAL_CONNECTIONS = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x071f00 /* Available since 7.31.0 */
 /**
  * @var int
  * @cvalue CURLOPT_SASL_IR
  */
 const CURLOPT_SASL_IR = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x072100 /* Available since 7.33.0 */
 /**
  * @var int
  * @cvalue CURLOPT_DNS_INTERFACE
@@ -2453,9 +2442,7 @@
  * @cvalue CURL_VERSION_HTTP2
  */
 const CURL_VERSION_HTTP2 = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */
 /**
  * @var int
  * @cvalue CURLOPT_LOGIN_OPTIONS
@@ -2477,9 +2464,7 @@
  * @cvalue CURL_SSLVERSION_TLSv1_2
  */
 const CURL_SSLVERSION_TLSv1_2 = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x072400 /* Available since 7.36.0 */
 /**
  * @var int
  * @cvalue CURLOPT_EXPECT_100_TIMEOUT_MS
@@ -2495,9 +2480,7 @@
  * @cvalue CURLOPT_SSL_ENABLE_NPN
  */
 const CURLOPT_SSL_ENABLE_NPN = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x072500 /* Available since 7.37.0 */
 /**
  * @var int
  * @cvalue CURLHEADER_SEPARATE
@@ -2518,9 +2501,7 @@
  * @cvalue CURLOPT_PROXYHEADER
  */
 const CURLOPT_PROXYHEADER = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x072600 /* Available since 7.38.0 */
 /**
  * @var int
  * @cvalue CURLAUTH_NEGOTIATE
@@ -2531,17 +2512,13 @@
  * @cvalue CURL_VERSION_GSSAPI
  */
 const CURL_VERSION_GSSAPI = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
 /**
  * @var int
  * @cvalue CURLOPT_PINNEDPUBLICKEY
  */
 const CURLOPT_PINNEDPUBLICKEY = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x072800 /* Available since 7.40.0 */
 /**
  * @var int
  * @cvalue CURLOPT_UNIX_SOCKET_PATH
@@ -2567,17 +2544,13 @@
  * @cvalue CURL_VERSION_UNIX_SOCKETS
  */
 const CURL_VERSION_UNIX_SOCKETS = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x072900 /* Available since 7.41.0 */
 /**
  * @var int
  * @cvalue CURLOPT_SSL_VERIFYSTATUS
  */
 const CURLOPT_SSL_VERIFYSTATUS = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x072a00 /* Available since 7.42.0 */
 /**
  * @var int
  * @cvalue CURLOPT_PATH_AS_IS
@@ -2588,9 +2561,7 @@
  * @cvalue CURLOPT_SSL_FALSESTART
  */
 const CURLOPT_SSL_FALSESTART = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x072b00 /* Available since 7.43.0 */
 /**
  * @var int
  * @cvalue CURL_HTTP_VERSION_2
@@ -2628,25 +2599,19 @@
  * @cvalue CURLPIPE_MULTIPLEX
  */
 const CURLPIPE_MULTIPLEX = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x072c00 /* Available since 7.44.0 */
 /**
  * @var int
  * @cvalue CURLSSLOPT_NO_REVOKE
  */
 const CURLSSLOPT_NO_REVOKE = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x072d00 /* Available since 7.45.0 */
 /**
  * @var int
  * @cvalue CURLOPT_DEFAULT_PROTOCOL
  */
 const CURLOPT_DEFAULT_PROTOCOL = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x072e00 /* Available since 7.46.0 */
 /**
  * @var int
  * @cvalue CURLOPT_STREAM_WEIGHT
@@ -2667,9 +2632,7 @@
  * @cvalue CURL_PUSH_DENY
  */
 const CURL_PUSH_DENY = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x072f00 /* Available since 7.47.0 */
 /**
  * @var int
  * @cvalue CURL_HTTP_VERSION_2TLS
@@ -2680,17 +2643,13 @@
  * @cvalue CURL_VERSION_PSL
  */
 const CURL_VERSION_PSL = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x073000 /* Available since 7.48.0 */
 /**
  * @var int
  * @cvalue CURLOPT_TFTP_NO_OPTIONS
  */
 const CURLOPT_TFTP_NO_OPTIONS = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x073100 /* Available since 7.49.0 */
 /**
  * @var int
  * @cvalue CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE
@@ -2706,17 +2665,13 @@
  * @cvalue CURLOPT_TCP_FASTOPEN
  */
 const CURLOPT_TCP_FASTOPEN = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x073200 /* Available since 7.50.0 */
 /**
  * @var int
  * @cvalue CURLINFO_HTTP_VERSION
  */
 const CURLINFO_HTTP_VERSION = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x073300 /* Available since 7.51.0 */
 /**
  * @var int
  * @cvalue CURLE_WEIRD_SERVER_REPLY
@@ -2727,9 +2682,7 @@
  * @cvalue CURLOPT_KEEP_SENDING_ON_ERROR
  */
 const CURLOPT_KEEP_SENDING_ON_ERROR = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x073400 /* Available since 7.52.0 */
 /**
  * @var int
  * @cvalue CURL_SSLVERSION_TLSv1_3
@@ -2850,9 +2803,7 @@
  * @cvalue CURLPROXY_HTTPS
  */
 const CURLPROXY_HTTPS = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x073500 /* Available since 7.53.0 */
 /**
  * @var int
  * @cvalue CURL_MAX_READ_SIZE
@@ -2863,9 +2814,7 @@
  * @cvalue CURLOPT_ABSTRACT_UNIX_SOCKET
  */
 const CURLOPT_ABSTRACT_UNIX_SOCKET = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x073600 /* Available since 7.54.0 */
 /**
  * @var int
  * @cvalue CURL_SSLVERSION_MAX_DEFAULT
@@ -2901,17 +2850,13 @@
  * @cvalue CURLOPT_SUPPRESS_CONNECT_HEADERS
  */
 const CURLOPT_SUPPRESS_CONNECT_HEADERS = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x073601 /* Available since 7.54.1 */
 /**
  * @var int
  * @cvalue CURLAUTH_GSSAPI
  */
 const CURLAUTH_GSSAPI = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x073700 /* Available since 7.55.0 */
 /**
  * @var int
  * @cvalue CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
@@ -2952,9 +2897,7 @@
  * @cvalue CURLOPT_SOCKS5_AUTH
  */
 const CURLOPT_SOCKS5_AUTH = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x073800 /* Available since 7.56.0 */
 /**
  * @var int
  * @cvalue CURLOPT_SSH_COMPRESSION
@@ -2965,9 +2908,7 @@
  * @cvalue CURL_VERSION_MULTI_SSL
  */
 const CURL_VERSION_MULTI_SSL = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x073900 /* Available since 7.57.0 */
 /**
  * @var int
  * @cvalue CURL_VERSION_BROTLI
@@ -2978,17 +2919,13 @@
  * @cvalue CURL_LOCK_DATA_CONNECT
  */
 const CURL_LOCK_DATA_CONNECT = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x073a00 /* Available since 7.58.0 */
 /**
  * @var int
  * @cvalue CURLSSH_AUTH_GSSAPI
  */
 const CURLSSH_AUTH_GSSAPI = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x073b00 /* Available since 7.59.0 */
 /**
  * @var int
  * @cvalue CURLINFO_FILETIME_T
@@ -3004,9 +2941,7 @@
  * @cvalue CURLOPT_TIMEVALUE_LARGE
  */
 const CURLOPT_TIMEVALUE_LARGE = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x073c00 /* Available since 7.60.0 */
 /**
  * @var int
  * @cvalue CURLOPT_DNS_SHUFFLE_ADDRESSES
@@ -3017,9 +2952,7 @@
  * @cvalue CURLOPT_HAPROXYPROTOCOL
  */
 const CURLOPT_HAPROXYPROTOCOL = UNKNOWN;
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x073d00 /* Available since 7.61.0 */
 /**
  * @var int
  * @cvalue CURL_LOCK_DATA_PSL
@@ -3080,7 +3013,6 @@
  * @cvalue CURLOPT_TLS13_CIPHERS
  */
 const CURLOPT_TLS13_CIPHERS = UNKNOWN;
-#endif
 
 #if LIBCURL_VERSION_NUM >= 0x073E00 /* Available since 7.62.0 */
 /**