Skip to content

Commit 41e1891

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Add CURLOPT CURLOPT_HTTP09_ALLOWED available since 7.64.0
2 parents 86f463c + b836d9c commit 41e1891

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

ext/curl/interface.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1394,6 +1394,10 @@ PHP_MINIT_FUNCTION(curl)
13941394
REGISTER_CURL_CONSTANT(CURLOPT_TLS13_CIPHERS);
13951395
#endif
13961396

1397+
#if LIBCURL_VERSION_NUM >= 0x074000 /* Available since 7.64.0 */
1398+
REGISTER_CURL_CONSTANT(CURLOPT_HTTP09_ALLOWED);
1399+
#endif
1400+
13971401
#if LIBCURL_VERSION_NUM >= 0x074001 /* Available since 7.64.1 */
13981402
REGISTER_CURL_CONSTANT(CURL_VERSION_ALTSVC);
13991403
#endif
@@ -2506,6 +2510,9 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{
25062510
#endif
25072511
#if LIBCURL_VERSION_NUM >= 0x073d00 /* Available since 7.61.0 */
25082512
case CURLOPT_DISALLOW_USERNAME_IN_URL:
2513+
#endif
2514+
#if LIBCURL_VERSION_NUM >= 0x074000 /* Available since 7.64.0 */
2515+
case CURLOPT_HTTP09_ALLOWED:
25092516
#endif
25102517
lval = zval_get_long(zvalue);
25112518
#if LIBCURL_VERSION_NUM >= 0x071304

0 commit comments

Comments
 (0)