Commit 473ce44

committed

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3: Fix more curl 8.16 issues

2 parents 1302b9f + a885372 commit 473ce44Copy full SHA for 473ce44

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1701,7 +1701,7 @@ static zend_result _php_curl_setopt(php_curl ch, zend_long option, zval zvalue`
`1701`	`1701`	`lval = zval_get_long(zvalue);`
`1702`	`1702`	`if (lval == 1) {`
`1703`	`1703`	`php_error_docref(NULL, E_NOTICE, "CURLOPT_SSL_VERIFYHOST no longer accepts the value 1, value 2 will be used instead");`
`1704`		`- error = curl_easy_setopt(ch->cp, option, 2);`
	`1704`	`+ error = curl_easy_setopt(ch->cp, option, 2L);`
`1705`	`1705`	`break;`
`1706`	`1706`	`}`
`1707`	`1707`	`ZEND_FALLTHROUGH;`
`@@ -2207,7 +2207,7 @@ static zend_result _php_curl_setopt(php_curl ch, zend_long option, zval zvalue`
`2207`	`2207`
`2208`	`2208`	`case CURLOPT_FOLLOWLOCATION:`
`2209`	`2209`	`lval = zend_is_true(zvalue);`
`2210`		`- error = curl_easy_setopt(ch->cp, option, lval);`
	`2210`	`+ error = curl_easy_setopt(ch->cp, option, (long) lval);`
`2211`	`2211`	`break;`
`2212`	`2212`
`2213`	`2213`	`case CURLOPT_POSTFIELDS:`

Comments

(0)