Skip to content

Commit f088aec

Browse files
committed
Fix UNKNOWN default value of apache_note()
Closes GH-6167
1 parent 40e8c7c commit f088aec

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

sapi/apache2handler/php_functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ PHP_FUNCTION(apache_note)
224224
size_t note_name_len, note_val_len;
225225
char *old_note_val=NULL;
226226

227-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|s", &note_name, &note_name_len, &note_val, &note_val_len) == FAILURE) {
227+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|s!", &note_name, &note_name_len, &note_val, &note_val_len) == FAILURE) {
228228
RETURN_THROWS();
229229
}
230230

sapi/apache2handler/php_functions.stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function getallheaders(): array {}
1313

1414
function apache_response_headers(): array {}
1515

16-
function apache_note(string $note_name, string $note_value = UNKNOWN): string|false {}
16+
function apache_note(string $note_name, ?string $note_value = null): string|false {}
1717

1818
function apache_setenv(string $variable, string $value, bool $walk_to_top = false): bool {}
1919

sapi/apache2handler/php_functions_arginfo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 3226aed29f13aa8146066a88e58ac2147ad8b500 */
2+
* Stub hash: 2e2e63b5c845bb74309b2b3e52ca5a3d76f2c80b */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_apache_lookup_uri, 0, 1, MAY_BE_OBJECT|MAY_BE_FALSE)
55
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
@@ -18,7 +18,7 @@ ZEND_END_ARG_INFO()
1818

1919
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_apache_note, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
2020
ZEND_ARG_TYPE_INFO(0, note_name, IS_STRING, 0)
21-
ZEND_ARG_TYPE_INFO(0, note_value, IS_STRING, 0)
21+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, note_value, IS_STRING, 1, "null")
2222
ZEND_END_ARG_INFO()
2323

2424
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_apache_setenv, 0, 2, _IS_BOOL, 0)

0 commit comments

Comments
 (0)