]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.3' into PHP-7.4
authorGeorge Wang <gwang@php.net>
Thu, 4 Jul 2019 16:14:48 +0000 (12:14 -0400)
committerGeorge Wang <gwang@php.net>
Thu, 4 Jul 2019 16:14:48 +0000 (12:14 -0400)
1  2 
sapi/litespeed/lsapi_main.c
sapi/litespeed/lsapilib.h

index 991631081e037a818a8d3754d7df1231c71b2ce2,b251bd0a24b206de3027a06db758ec298c0c6b9b..1c577c94599cf4e51fa297e9f6e78b510bbd7cd9
@@@ -1223,6 -1458,17 +1451,16 @@@ int main( int argc, char * argv[] 
      int slow_script_msec = 0;
      char time_buf[40];
  
 -#ifdef HAVE_SIGNAL_H
+     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;
  #if defined(SIGPIPE) && defined(SIG_IGN)
      signal(SIGPIPE, SIG_IGN);
  #endif
Simple merge