1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

GH-15440: adding CURLOPT_TCP_KEEPCNT constant (8.9.0) (#15446)

close GH-15446
This commit is contained in:
David CARLIER
2024-08-16 21:47:41 +02:00
committed by GitHub
parent bb0c32583a
commit b5568a008f
5 changed files with 19 additions and 1 deletions

4
NEWS
View File

@@ -17,6 +17,10 @@ PHP NEWS
As such, passing invalid types to exit/die may now result in a TypeError
being thrown. (Girgias)
- CURL:
. Added CURLOPT_TCP_KEEPCNT to set the number of probes to send before
dropping the connection. (David Carlier)
- Hash:
. Fix GH-15384 (Build fails on Alpine / Musl for amd64). (timwolla)

View File

@@ -917,6 +917,7 @@ PHP 8.4 UPGRADE NOTES
- Curl:
. CURL_HTTP_VERSION_3.
. CURL_HTTP_VERSION_3ONLY.
. CURL_TCP_KEEPCNT
- Intl:
. The IntlDateFormatter class exposes now the new PATTERN constant

View File

@@ -407,6 +407,13 @@ const CURLOPT_SSL_VERIFYPEER = UNKNOWN;
* @cvalue CURLOPT_STDERR
*/
const CURLOPT_STDERR = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x080900 /* Available since 8.9.0 */
/**
* @var int
* @cvalue CURLOPT_TCP_KEEPCNT
*/
const CURLOPT_TCP_KEEPCNT = UNKNOWN;
#endif
/**
* @var int
* @cvalue CURLOPT_TELNETOPTIONS

View File

@@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: b5a3bd62bcb62b2e7e4aacfcd4621cc632be1564 */
* Stub hash: ddfcdd8a0bf0ee6c338ec1689c6de5d7fd87303d */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_curl_close, 0, 1, IS_VOID, 0)
ZEND_ARG_OBJ_INFO(0, handle, CurlHandle, 0)
@@ -307,6 +307,9 @@ static void register_curl_symbols(int module_number)
REGISTER_LONG_CONSTANT("CURLOPT_SSL_VERIFYHOST", CURLOPT_SSL_VERIFYHOST, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("CURLOPT_SSL_VERIFYPEER", CURLOPT_SSL_VERIFYPEER, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("CURLOPT_STDERR", CURLOPT_STDERR, CONST_PERSISTENT);
#if LIBCURL_VERSION_NUM >= 0x080900 /* Available since 8.9.0 */
REGISTER_LONG_CONSTANT("CURLOPT_TCP_KEEPCNT", CURLOPT_TCP_KEEPCNT, CONST_PERSISTENT);
#endif
REGISTER_LONG_CONSTANT("CURLOPT_TELNETOPTIONS", CURLOPT_TELNETOPTIONS, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("CURLOPT_TIMECONDITION", CURLOPT_TIMECONDITION, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("CURLOPT_TIMEOUT", CURLOPT_TIMEOUT, CONST_PERSISTENT);

View File

@@ -1728,6 +1728,9 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
#if LIBCURL_VERSION_NUM >= 0x075700 /* Available since 7.87.0 */
case CURLOPT_CA_CACHE_TIMEOUT:
case CURLOPT_QUICK_EXIT:
#endif
#if LIBCURL_VERSION_NUM >= 0x080900 /* Available since 8.9.0 */
case CURLOPT_TCP_KEEPCNT:
#endif
lval = zval_get_long(zvalue);
if ((option == CURLOPT_PROTOCOLS || option == CURLOPT_REDIR_PROTOCOLS) &&