archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.2' into PHP-7.3

Browse source
This commit is contained in:
George Wang 2019-11-21 17:58:16 -05:00
commit e981f5af51
1 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

38
sapi/litespeed/lsapi_main.c
View file

@ -610,7 +610,7 @@ static int sapi_lsapi_activate()
static sapi_module_struct lsapi_sapi_module = static sapi_module_struct lsapi_sapi_module =
{ {
"litespeed", "litespeed",
"LiteSpeed V7.5", "LiteSpeed V7.6",
php_lsapi_startup, /* startup */ php_lsapi_startup, /* startup */
php_module_shutdown_wrapper, /* shutdown */ php_module_shutdown_wrapper, /* shutdown */
@ -691,6 +691,8 @@ static void lsapi_sigsegv( int signal )
_exit(1); _exit(1);
} }
static int do_clean_shutdown = 1;
static int clean_onexit = 1; static int clean_onexit = 1;
@ -766,18 +768,20 @@ static int lsapi_module_main(int show_source)
return -1; return -1;
} }
sigemptyset(&act.sa_mask); if (do_clean_shutdown) {
act.sa_flags = SA_NODEFER; sigemptyset(&act.sa_mask);
act.sa_handler = lsapi_sigterm; act.sa_flags = SA_NODEFER;
sa_rc = sigaction( SIGINT, &act, NULL); act.sa_handler = lsapi_sigterm;
sa_rc = sigaction( SIGQUIT, &act, NULL); sa_rc = sigaction( SIGINT, &act, NULL);
sa_rc = sigaction( SIGILL, &act, NULL); sa_rc = sigaction( SIGQUIT, &act, NULL);
sa_rc = sigaction( SIGABRT, &act, NULL); sa_rc = sigaction( SIGILL, &act, NULL);
sa_rc = sigaction( SIGBUS, &act, NULL); sa_rc = sigaction( SIGABRT, &act, NULL);
sa_rc = sigaction( SIGSEGV, &act, NULL); sa_rc = sigaction( SIGBUS, &act, NULL);
sa_rc = sigaction( SIGTERM, &act, NULL); sa_rc = sigaction( SIGSEGV, &act, NULL);
sa_rc = sigaction( SIGTERM, &act, NULL);
clean_onexit = 0; clean_onexit = 0;
}
if (show_source) { if (show_source) {
zend_syntax_highlighter_ini syntax_highlighter_ini; zend_syntax_highlighter_ini syntax_highlighter_ini;
@ -1585,7 +1589,8 @@ int main( int argc, char * argv[] )
int result; int result;
atexit(lsapi_atexit); if (do_clean_shutdown)
atexit(lsapi_atexit);
while( ( result = LSAPI_Prefork_Accept_r( &g_req )) >= 0 ) { while( ( result = LSAPI_Prefork_Accept_r( &g_req )) >= 0 ) {
#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__) #if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__)
@ -1659,6 +1664,13 @@ static PHP_MINIT_FUNCTION(litespeed)
if (p && 0 == strcasecmp(p, "on")) if (p && 0 == strcasecmp(p, "on"))
parse_user_ini = 1; parse_user_ini = 1;
p = getenv("LSAPI_CLEAN_SHUTDOWN");
if (p) {
if (*p == '1' || 0 == strcasecmp(p, "on"))
do_clean_shutdown = 1;
else if (*p == '0' || 0 == strcasecmp(p, "off"))
do_clean_shutdown = 0;
}
/* /*
* mod_lsapi always sets this env var, * mod_lsapi always sets this env var,
* so we can detect mod_lsapi mode with its presense. * so we can detect mod_lsapi mode with its presense.