Skip to content

Commit 9179a4a

Browse files
committed
Make litespeed_request_headers() an alias of apache_request_headers()
1 parent 5a79215 commit 9179a4a

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

Zend/Optimizer/zend_func_infos.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -701,8 +701,9 @@ static const func_info_t func_infos[] = {
701701
F1("gzinflate", MAY_BE_STRING|MAY_BE_FALSE),
702702
F1("gzdecode", MAY_BE_STRING|MAY_BE_FALSE),
703703
F1("gzuncompress", MAY_BE_STRING|MAY_BE_FALSE),
704+
F1("apache_request_headers", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_STRING),
705+
F1("apache_get_modules", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING),
704706
F1("fpm_get_status", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_FALSE),
705-
F1("litespeed_request_headers", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_STRING),
706707
F1("litespeed_response_headers", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_STRING|MAY_BE_FALSE),
707708
F1("phpdbg_get_executable", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ARRAY),
708709
};

sapi/litespeed/lsapi_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1668,7 +1668,7 @@ static int add_associate_array( const char * pKey, int keyLen, const char * pVal
16681668

16691669

16701670
/* {{{ Fetch all HTTP request headers */
1671-
PHP_FUNCTION(litespeed_request_headers)
1671+
PHP_FUNCTION(apache_request_headers)
16721672
{
16731673
if (zend_parse_parameters_none() == FAILURE) {
16741674
RETURN_THROWS();

sapi/litespeed/lsapi_main.stub.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,19 @@
44

55
/**
66
* @return array<string, string>
7-
* @refcount 1
7+
* @alias apache_request_headers
88
*/
99
function litespeed_request_headers(): array {}
1010

1111
/**
1212
* @return array<string, string>
13-
* @refcount 1
14-
* @alias litespeed_request_headers
13+
* @alias apache_request_headers
1514
*/
1615
function getallheaders(): array {}
1716

1817
/**
1918
* @return array<string, string>
20-
* @alias litespeed_request_headers
19+
* @refcount 1
2120
*/
2221
function apache_request_headers(): array {}
2322

@@ -33,6 +32,10 @@ function litespeed_response_headers(): array|false {}
3332
*/
3433
function apache_response_headers(): array|false {}
3534

35+
/**
36+
* @return array<int, string>
37+
* @refcount 1
38+
*/
3639
function apache_get_modules(): array {}
3740

3841
function litespeed_finish_request(): bool {}

sapi/litespeed/lsapi_main_arginfo.h

Lines changed: 5 additions & 5 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: a7b80048c40a6e6d530d92f27c4b8c4ea455dbcc */
2+
* Stub hash: c15e39addd40a6244694c37fecc88464fcf4db0d */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_litespeed_request_headers, 0, 0, IS_ARRAY, 0)
55
ZEND_END_ARG_INFO()
@@ -19,16 +19,16 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_litespeed_finish_request, 0, 0,
1919
ZEND_END_ARG_INFO()
2020

2121

22-
ZEND_FUNCTION(litespeed_request_headers);
22+
ZEND_FUNCTION(apache_request_headers);
2323
ZEND_FUNCTION(litespeed_response_headers);
2424
ZEND_FUNCTION(apache_get_modules);
2525
ZEND_FUNCTION(litespeed_finish_request);
2626

2727

2828
static const zend_function_entry ext_functions[] = {
29-
ZEND_FE(litespeed_request_headers, arginfo_litespeed_request_headers)
30-
ZEND_FALIAS(getallheaders, litespeed_request_headers, arginfo_getallheaders)
31-
ZEND_FALIAS(apache_request_headers, litespeed_request_headers, arginfo_apache_request_headers)
29+
ZEND_FALIAS(litespeed_request_headers, apache_request_headers, arginfo_litespeed_request_headers)
30+
ZEND_FALIAS(getallheaders, apache_request_headers, arginfo_getallheaders)
31+
ZEND_FE(apache_request_headers, arginfo_apache_request_headers)
3232
ZEND_FE(litespeed_response_headers, arginfo_litespeed_response_headers)
3333
ZEND_FALIAS(apache_response_headers, litespeed_response_headers, arginfo_apache_response_headers)
3434
ZEND_FE(apache_get_modules, arginfo_apache_get_modules)

0 commit comments

Comments
 (0)