Fix UNKNOWN default value of apache_note()

Closes GH-6167

diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index 1a601e69063d9f3dca5b33c142e4883459955315..e7d29450ee8b2b139e5f9ab24d4e484a25646bfb 100644 (file)
--- a/sapi/apache2handler/php_functions.c
+++ b/sapi/apache2handler/php_functions.c
@@ -224,7 +224,7 @@ PHP_FUNCTION(apache_note)
        size_t note_name_len, note_val_len;
        char *old_note_val=NULL;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|s", &note_name, &note_name_len, &note_val, &note_val_len) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|s!", &note_name, &note_name_len, &note_val, &note_val_len) == FAILURE) {
                RETURN_THROWS();
        }
 

diff --git a/sapi/apache2handler/php_functions.stub.php b/sapi/apache2handler/php_functions.stub.php
index 391600be6ca60d50e684dd9499c7d38e0a55e5b9..93955c7181a0d5d21323396520ad78d1cc4500fe 100644 (file)
--- a/sapi/apache2handler/php_functions.stub.php
+++ b/sapi/apache2handler/php_functions.stub.php
@@ -13,7 +13,7 @@ function getallheaders(): array {}
 
 function apache_response_headers(): array {}
 
-function apache_note(string $note_name, string $note_value = UNKNOWN): string|false {}
+function apache_note(string $note_name, ?string $note_value = null): string|false {}
 
 function apache_setenv(string $variable, string $value, bool $walk_to_top = false): bool {}
 

diff --git a/sapi/apache2handler/php_functions_arginfo.h b/sapi/apache2handler/php_functions_arginfo.h
index 83dae8c6ef9b0ec0d54ddb280eaf2cfaf1f1e9ec..a712ce590c5bd263182cec9850b2c60d24f7d740 100644 (file)
--- a/sapi/apache2handler/php_functions_arginfo.h
+++ b/sapi/apache2handler/php_functions_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 3226aed29f13aa8146066a88e58ac2147ad8b500 */
+ * Stub hash: 2e2e63b5c845bb74309b2b3e52ca5a3d76f2c80b */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_apache_lookup_uri, 0, 1, MAY_BE_OBJECT|MAY_BE_FALSE)
        ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
@@ -18,7 +18,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_apache_note, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
        ZEND_ARG_TYPE_INFO(0, note_name, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, note_value, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, note_value, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_apache_setenv, 0, 2, _IS_BOOL, 0)