summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Wang <gwang@php.net>2019-04-21 14:59:51 -0400
committerChristoph M. Becker <cmbecker69@gmx.de>2019-04-24 10:09:03 +0200
commit7b6c06966f9b0cfd717654ff045a670977d551f9 (patch)
tree4544deb8ab8a76894ec6a7cbf0fb29f5c7cf927d
parent3caa67740a94a5669ad419c4378476ba7825a294 (diff)
downloadphp-git-7b6c06966f9b0cfd717654ff045a670977d551f9.tar.gz
Fixed bug in litespeed_finish_request(), disable fastcgi_finish_request() alias for now.
(cherry picked from commit ccf051c317e606c2a4d9099c6e79a5c42bfdb298)
-rw-r--r--sapi/litespeed/lsapi_main.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c
index 2598141722..a5eb973cad 100644
--- a/sapi/litespeed/lsapi_main.c
+++ b/sapi/litespeed/lsapi_main.c
@@ -455,7 +455,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 */
@@ -1390,7 +1390,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}
};
@@ -1526,6 +1525,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;
}