Merge branch 'PHP-8.0' into PHP-8.1

Author: adoy

NEWS

@@ -10,6 +10,9 @@ PHP                                                                        NEWS
   . Fixed bug GH-8655 (Casting an object to array does not unwrap refcount=1
     references). (Nicolas Grekas)
 
+- Curl:
+  . Fixed CURLOPT_TLSAUTH_TYPE is not treated as a string option. (Pierrick)
+
 - Date:
   . Fixed bug #72963 (Null-byte injection in CreateFromFormat and related
     functions). (Derick)

ext/curl/interface.c

@@ -2363,7 +2363,6 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue, bool i
 		case CURLOPT_RTSP_REQUEST:
 		case CURLOPT_RTSP_SERVER_CSEQ:
 		case CURLOPT_WILDCARDMATCH:
-		case CURLOPT_TLSAUTH_TYPE:
 		case CURLOPT_GSSAPI_DELEGATION:
 		case CURLOPT_ACCEPTTIMEOUT_MS:
 		case CURLOPT_SSL_OPTIONS:
@@ -2482,6 +2481,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue, bool i
 		case CURLOPT_MAIL_FROM:
 		case CURLOPT_RTSP_STREAM_URI:
 		case CURLOPT_RTSP_TRANSPORT:
+		case CURLOPT_TLSAUTH_TYPE:
 		case CURLOPT_TLSAUTH_PASSWORD:
 		case CURLOPT_TLSAUTH_USERNAME:
 		case CURLOPT_ACCEPT_ENCODING: