From: George Wang <gwang@php.net>
Date: Thu, 4 Jul 2019 16:14:48 +0000 (-0400)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0alpha3~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a403504e7f35927702a898a2459fcaa39265ba2;p=php

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

6a403504e7f35927702a898a2459fcaa39265ba2
diff --cc sapi/litespeed/lsapi_main.c
index 991631081e,b251bd0a24..1c577c9459
--- a/sapi/litespeed/lsapi_main.c
+++ b/sapi/litespeed/lsapi_main.c
@@@ -1223,6 -1458,17 +1451,16 @@@ 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