ext/curl: CURLOPT_FOLLOWLOCATION option handling.

UPGRADING

@@ -153,6 +153,13 @@ PHP 8.5 UPGRADE NOTES
     CURLOPT_INFILESIZE only accepts a 32-bit signed integer as the file
     size (2.0 GiB) even on 64-bit systems. CURLOPT_INFILESIZE_LARGE
     accepts the largest integer value the system can handle.
+  . Added CURLFOLLOW_OBEYCODE, CURLFOLLOW_FIRSTONLY and CURLFOLLOW_ALL values for
+    CURLOPT_FOLLOWLOCATION curl_easy_setopt option.
+    CURLFOLLOW_OBEYCODE to follow more strictly in regard of redirect
+    if they are allowed. CURLFOLLOW_FIRSTONLY to follow only the
+    first redirect thus if there any follow up redirect, it won't go
+    any further. CURLFOLLOW_ALL is equivalent to set CURLOPT_FOLLOWLOCATION
+    to true.
 
 - DOM:
   . Added Dom\Element::$outerHTML.
@@ -351,6 +358,11 @@ PHP 8.5 UPGRADE NOTES
 9. Other Changes to Extensions
 ========================================
 
+- Curl:
+  . curl_easy_setopt with CURLOPT_FOLLOWLOCATION option's value no longer
+    is treated as boolean but integer to handle CURLFOLLOW_OBEYCODE and
+    CURLFOLLOW_FIRSTONLY.
+
 - Fileinfo:
   . Upgraded to file 5.46.
   . The return type of finfo_close() has been changed to true, rather
@@ -377,6 +389,9 @@ PHP 8.5 UPGRADE NOTES
   . CURLINFO_HTTPAUTH_USED.
   . CURLINFO_PROXYAUTH_USED.
   . CURLOPT_INFILESIZE_LARGE.
+  . CURLFOLLOW_ALL.
+  . CURLFOLLOW_OBEYCODE.
+  . CURLFOLLOW_FIRSTONLY.
 
 - Intl:
   . DECIMAL_COMPACT_SHORT.

ext/curl/curl.stub.php

@@ -497,6 +497,24 @@
  */
 const CURLOPT_DEBUGFUNCTION = UNKNOWN;
 
+#if LIBCURL_VERSION_NUM >= 0x080d00 /* Available since 8.13.0 */
+/**
+ * @var int
+ * @cvalue CURLFOLLOW_ALL
+ */
+const CURLFOLLOW_ALL = UNKNOWN;
+/**
+ * @var int
+ * @cvalue CURLFOLLOW_OBEYCODE
+ */
+const CURLFOLLOW_OBEYCODE = UNKNOWN;
+/**
+ * @var int
+ * @cvalue CURLFOLLOW_FIRSTONLY
+ */
+const CURLFOLLOW_FIRSTONLY = UNKNOWN;
+#endif
+
 /**
  * @var int
  * @cvalue CURLINFO_TEXT

ext/curl/interface.c

@@ -1863,6 +1863,7 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
 #if LIBCURL_VERSION_NUM >= 0x080900 /* Available since 8.9.0 */
 		case CURLOPT_TCP_KEEPCNT:
 #endif
+		case CURLOPT_FOLLOWLOCATION:
 			lval = zval_get_long(zvalue);
 			if ((option == CURLOPT_PROTOCOLS || option == CURLOPT_REDIR_PROTOCOLS) &&
 				(PG(open_basedir) && *PG(open_basedir)) && (lval & CURLPROTO_FILE)) {
@@ -2210,11 +2211,6 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
 			/* Do nothing, just backward compatibility */
 			break;
 
-		case CURLOPT_FOLLOWLOCATION:
-			lval = zend_is_true(zvalue);
-			error = curl_easy_setopt(ch->cp, option, lval);
-			break;
-
 		case CURLOPT_POSTFIELDS:
 			if (Z_TYPE_P(zvalue) == IS_ARRAY) {
 				if (zend_hash_num_elements(Z_ARRVAL_P(zvalue)) == 0) {

ext/curl/tests/curl_setopt_CURLOPT_FOLLOWLOCATION.phpt

@@ -0,0 +1,31 @@
+--TEST--
+CURLOPT_FOLLOWLOCATION values
+--EXTENSIONS--
+curl
+--SKIPIF--
+<?php
+include 'skipif-nocaddy.inc';
+if (curl_version()['version_number'] < 0x080d00) die('skip requires curl >= 8.13.0');
+?>
+--FILE--
+<?php
+
+for ($i = 0; $i <= CURLFOLLOW_FIRSTONLY; $i ++) {
+	$ch = curl_init();
+	curl_setopt($ch,CURLOPT_URL, "https://localhost/redirect");
+	curl_setopt($ch,CURLOPT_RETURNTRANSFER,true);
+	var_dump(curl_setopt($ch, CURLOPT_FOLLOWLOCATION, $i));
+	var_dump(curl_exec($ch));
+	curl_close($ch);
+}
+?>
+--EXPECTF--
+bool(true)
+string(%d) "%s"
+bool(true)
+string(%d) "%s"
+bool(true)
+string(%d) "%s"
+bool(true)
+string(%d) "%s"
+