ext/curl: libcurl CURLOPT_{FTP_RESPONSE_TIMEOUT,ENCODING} replaceme…

…nts (#15126)
php · Aug 31, 2024 · a8df3d1 · a8df3d1
1 parent 82c504f
commit a8df3d1
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/NEWS b/NEWS
@@ -41,6 +41,10 @@ PHP                                                                        NEWS
     EAI_SYSTEM not found). (nielsdos)
   . Implemented asymmetric visibility for properties. (ilutov)
 
+- Curl:
+  . Added CURLOPT_SERVER_RESPONSE_TIMEOUT, which was formerly known as
+    CURLOPT_FTP_RESPONSE_TIMEOUT. (Ayesh Karunaratne)
+
 - Date:
   . Fixed bug GH-13773 (DatePeriod not taking into account microseconds for end
     date). (Mark Bennewitz, Derick)

diff --git a/UPGRADING b/UPGRADING
@@ -292,6 +292,8 @@ PHP 8.4 UPGRADE NOTES
     supported (true) or not (false).
   . Added CURL_HTTP_VERSION_3 and CURL_HTTP_VERSION_3ONLY constants (available
     since libcurl 7.66 and 7.88) as available options for CURLOPT_HTTP_VERSION.
+  . Added CURLOPT_SERVER_RESPONSE_TIMEOUT, which was formerly known as
+    CURLOPT_FTP_RESPONSE_TIMEOUT. Both constants hold the same value.
 
 - Date:
   . Added static methods
@@ -996,6 +998,7 @@ PHP 8.4 UPGRADE NOTES
   . CURL_HTTP_VERSION_3.
   . CURL_HTTP_VERSION_3ONLY.
   . CURL_TCP_KEEPCNT
+  . CURLOPT_SERVER_RESPONSE_TIMEOUT.
 
 - Intl:
   . The IntlDateFormatter class exposes now the new PATTERN constant

diff --git a/ext/curl/curl.stub.php b/ext/curl/curl.stub.php
@@ -84,7 +84,8 @@
 const CURLOPT_EGDSOCKET = UNKNOWN;
 /**
  * @var int
- * @cvalue CURLOPT_ENCODING
+ * @cvalue CURLOPT_ACCEPT_ENCODING
+ * @alias CURLOPT_ACCEPT_ENCODING
  */
 const CURLOPT_ENCODING = UNKNOWN;
 /**
@@ -1291,9 +1292,15 @@
 const CURLINFO_PROXYAUTH_AVAIL = UNKNOWN;
 /**
  * @var int
- * @cvalue CURLOPT_FTP_RESPONSE_TIMEOUT
+ * @cvalue CURLOPT_SERVER_RESPONSE_TIMEOUT
+ * @alias CURLOPT_SERVER_RESPONSE_TIMEOUT
  */
 const CURLOPT_FTP_RESPONSE_TIMEOUT = UNKNOWN;
+/**
+ * @var int
+ * @cvalue CURLOPT_SERVER_RESPONSE_TIMEOUT
+ */
+const CURLOPT_SERVER_RESPONSE_TIMEOUT = UNKNOWN;
 /**
  * @var int
  * @cvalue CURLOPT_IPRESOLVE

diff --git a/ext/curl/curl_arginfo.h b/ext/curl/curl_arginfo.h
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
@@ -1695,7 +1695,7 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
 		case CURLOPT_HTTPAUTH:
 		case CURLOPT_FTP_CREATE_MISSING_DIRS:
 		case CURLOPT_PROXYAUTH:
-		case CURLOPT_FTP_RESPONSE_TIMEOUT:
+		case CURLOPT_SERVER_RESPONSE_TIMEOUT:
 		case CURLOPT_IPRESOLVE:
 		case CURLOPT_MAXFILESIZE:
 		case CURLOPT_TCP_NODELAY: