Fix review comments

- Add line to NEWS
- Test more values for writable file handles
- Fallback to zend_constants if curl_easy_option_by_id fails

Author: Sjord

NEWS

@@ -107,6 +107,8 @@ PHP                                                                        NEWS
     and CURL_SEEKFUNC_CANTSEEK constants, letting libcurl rewind a streamed
     request body to resend it on a redirect, multi-pass authentication or a
     retried reused connection. (GrahamCampbell)
+  . Improved cURL option validation errors to include the option name.
+    (Sjoerd Langkemper)
 
 - Date:
   . Update timelib to 2022.17. (Derick)

ext/curl/interface.c

@@ -64,12 +64,14 @@ ZEND_DECLARE_MODULE_GLOBALS(curl)
 
 // php_curl_option_get_name(CURLOPT_HTTPHEADER) -> "HTTPHEADER"
 static const char * php_curl_option_get_name(zend_long option) {
+
 #if LIBCURL_VERSION_NUM >= 0x074900
 	const struct curl_easyoption * opt = curl_easy_option_by_id(option);
 	if (EXPECTED(opt != NULL)) {
 		return opt->name;
 	}
-#else
+#endif
+
 	const char prefix[] = "CURLOPT_";
 	const size_t prefix_len = sizeof(prefix) - 1;
 	zend_string *key;
@@ -86,7 +88,6 @@ static const char * php_curl_option_get_name(zend_long option) {
 			return ZSTR_VAL(key) + prefix_len;
 		}
 	} ZEND_HASH_FOREACH_END();
-#endif
 	return "UNKNOWN_OPTION";
 }
 

ext/curl/tests/bug48207.phpt

@@ -36,10 +36,17 @@ $tempfile	= tempnam(sys_get_temp_dir(), 'CURL_FILE_HANDLE');
 $fp = fopen($tempfile, "r"); // Opening 'fubar' with the incorrect readonly flag
 
 $ch = curl_init($url);
-try {
-    curl_setopt($ch, CURLOPT_FILE, $fp);
-} catch (ValueError $exception) {
-    echo $exception->getMessage() . "\n";
+
+foreach ([
+    CURLOPT_FILE,
+    CURLOPT_WRITEHEADER,
+    CURLOPT_STDERR,
+] as $option) {
+    try {
+        curl_setopt($ch, $option, $fp);
+    } catch (ValueError $exception) {
+        echo $exception->getMessage(), "\n";
+    }
 }
 
 curl_exec($ch);
@@ -48,5 +55,7 @@ isset($tempname) and is_file($tempname) and @unlink($tempname);
 ?>
 --EXPECT--
 curl_setopt(): The file handle provided for CURLOPT_FILE must be writable
+curl_setopt(): The file handle provided for CURLOPT_WRITEHEADER must be writable
+curl_setopt(): The file handle provided for CURLOPT_STDERR must be writable
 Hello World!
 Hello World!