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

Merge branch 'PHP-7.3' into PHP-7.4
---

30de357fa14480468132bbc22a272aeb91789ba8
diff --cc sapi/litespeed/lsapi_main.c
index 0859d4a9b3,d3ac79eb7b..a851212c85
--- a/sapi/litespeed/lsapi_main.c
+++ b/sapi/litespeed/lsapi_main.c
@@@ -1443,16 -1484,8 +1469,7 @@@ int main( int argc, char * argv[] 
      int slow_script_msec = 0;
      char time_buf[40];
  
-     struct sigaction act, old_act;
-     struct sigaction INT_act;
-     struct sigaction QUIT_act;
-     struct sigaction ILL_act;
-     struct sigaction ABRT_act;
-     struct sigaction BUS_act;
-     struct sigaction SEGV_act;
-     struct sigaction TERM_act;
-     int sa_rc;
  
 -#ifdef HAVE_SIGNAL_H
  #if defined(SIGPIPE) && defined(SIG_IGN)
      signal(SIGPIPE, SIG_IGN);
  #endif