From: George Wang <gwang@php.net>
Date: Sun, 21 Jul 2019 04:01:06 +0000 (-0400)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.4.0beta1~42^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=82f35ab0890e192e76665194a245365d5d249638;p=php

Merge branch 'PHP-7.2' into PHP-7.3
---

82f35ab0890e192e76665194a245365d5d249638
diff --cc sapi/litespeed/lsapi_main.c
index b251bd0a24,8f02f15c32..d3ac79eb7b
--- a/sapi/litespeed/lsapi_main.c
+++ b/sapi/litespeed/lsapi_main.c
@@@ -1566,17 -1598,9 +1583,8 @@@ int main( int argc, char * argv[] 
          php_bind = NULL;
      }
  
 -    int iRequestsProcessed = 0;
      int result;
  
-     act.sa_flags = SA_NODEFER;
-     act.sa_handler = lsapi_sigterm;
-     sa_rc = sigaction( SIGINT, &act, &INT_act );
-     sa_rc = sigaction( SIGQUIT, &act, &QUIT_act );
-     sa_rc = sigaction( SIGILL, &act, &ILL_act );
-     sa_rc = sigaction( SIGABRT, &act, &ABRT_act );
-     sa_rc = sigaction( SIGBUS, &act, &BUS_act );
-     sa_rc = sigaction( SIGSEGV, &act, &SEGV_act );
-     sa_rc = sigaction( SIGTERM, &act, &TERM_act );
      atexit(lsapi_atexit);
  
      while( ( result = LSAPI_Prefork_Accept_r( &g_req )) >= 0 ) {