archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.3' into PHP-7.4

Browse source
This commit is contained in:
George Wang 2019-04-21 15:59:49 -04:00
commit bd86ae4b8a
2 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sapi/litespeed/lsapi_main.c
View file

@ -448,7 +448,7 @@ static int sapi_lsapi_activate()
static sapi_module_struct lsapi_sapi_module =
{
"litespeed",
"LiteSpeed V7.3",
"LiteSpeed V7.3.1",
php_lsapi_startup, /* startup */
php_module_shutdown_wrapper, /* shutdown */
@ -1380,7 +1380,6 @@ static const zend_function_entry litespeed_functions[] = {
PHP_FALIAS(getallheaders, litespeed_request_headers, arginfo_litespeed__void)
PHP_FALIAS(apache_request_headers, litespeed_request_headers, arginfo_litespeed__void)
PHP_FALIAS(apache_response_headers, litespeed_response_headers, arginfo_litespeed__void)
PHP_FALIAS(fastcgi_finish_request, litespeed_finish_request, arginfo_litespeed__void)
{NULL, NULL, NULL}
};
@ -1516,6 +1515,10 @@ PHP_FUNCTION(litespeed_finish_request)
if (ZEND_NUM_ARGS() > 0) {
WRONG_PARAM_COUNT;
}
php_output_end_all();
php_header();
if (LSAPI_End_Response() != -1) {
RETURN_TRUE;
}