[php-src] master: Rename FPM's apache_request_headers() implementation to fpm_request_headers (#24249)

Author: Matthieu Napoli (mnapoli) Committer: GitHub (web-flow) Pusher: kocsismate Date: 2026-10-12T08:29:14+02:00 Commit: https://github.com/php/php-src/commit/7dccee0ed3e359a50e10ec89bf6f51245a6aca15 Raw diff: https://github.com/php/php-src/commit/7dccee0ed3e359a50e10ec89bf6f51245a6aca15.diff Rename FPM's apache_request_headers() implementation to fpm_request_headers (#24249) Changed paths: M sapi/fpm/fpm/fpm_main.c M sapi/fpm/fpm/fpm_main.stub.php M sapi/fpm/fpm/fpm_main_arginfo.h Diff: diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index 250c926563f0..3d35e942a06e 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -1494,7 +1494,7 @@ PHP_FUNCTION(fastcgi_finish_request) /* {{{ */ } /* }}} */ -PHP_FUNCTION(apache_request_headers) /* {{{ */ +PHP_FUNCTION(fpm_request_headers) /* {{{ */ { fcgi_request *request; diff --git a/sapi/fpm/fpm/fpm_main.stub.php b/sapi/fpm/fpm/fpm_main.stub.php index 70cd27522391..8cd91dc9b908 100644 --- a/sapi/fpm/fpm/fpm_main.stub.php +++ b/sapi/fpm/fpm/fpm_main.stub.php @@ -4,9 +4,10 @@ function fastcgi_finish_request(): bool {} +/** @implementation-alias fpm_request_headers */ function apache_request_headers(): array {} -/** @alias apache_request_headers */ +/** @implementation-alias fpm_request_headers */ function getallheaders(): array {} function fpm_get_status(): array|false {} diff --git a/sapi/fpm/fpm/fpm_main_arginfo.h b/sapi/fpm/fpm/fpm_main_arginfo.h index e612f160e760..0931c8c7adc3 100644 --- a/sapi/fpm/fpm/fpm_main_arginfo.h +++ b/sapi/fpm/fpm/fpm_main_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit fpm_main.stub.php instead. - * Stub hash: b4ac4c0f1d91c354293e21185a2e6d9f99cc9fcc */ + * Stub hash: b9cdc331451e1f03af1faf6fc621a4ad62603ab0 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_fastcgi_finish_request, 0, 0, _IS_BOOL, 0) ZEND_END_ARG_INFO() @@ -13,13 +13,13 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_fpm_get_status, 0, 0, MAY_BE_ARR ZEND_END_ARG_INFO() ZEND_FUNCTION(fastcgi_finish_request); -ZEND_FUNCTION(apache_request_headers); +ZEND_FUNCTION(fpm_request_headers); ZEND_FUNCTION(fpm_get_status); static const zend_function_entry ext_functions[] = { ZEND_FE(fastcgi_finish_request, arginfo_fastcgi_finish_request) - ZEND_FE(apache_request_headers, arginfo_apache_request_headers) - ZEND_RAW_FENTRY("getallheaders", zif_apache_request_headers, arginfo_getallheaders, 0, NULL, NULL) + ZEND_RAW_FENTRY("apache_request_headers", zif_fpm_request_headers, arginfo_apache_request_headers, 0, NULL, NULL) + ZEND_RAW_FENTRY("getallheaders", zif_fpm_request_headers, arginfo_getallheaders, 0, NULL, NULL) ZEND_FE(fpm_get_status, arginfo_fpm_get_status) ZEND_FE_END };