@@ -1657,14 +1657,6 @@ int main(int argc, char **argv) /* {{{ */
1657
1657
} zend_end_try ();
1658
1658
#endif
1659
1659
1660
- #if defined(ZEND_SIGNALS ) && !defined(_WIN32 )
1661
- zend_try { zend_sigaction (SIGSEGV , & signal_struct , & PHPDBG_G (old_sigsegv_signal )); } zend_end_try ();
1662
- zend_try { zend_sigaction (SIGBUS , & signal_struct , & PHPDBG_G (old_sigsegv_signal )); } zend_end_try ();
1663
- #elif !defined(_WIN32 )
1664
- sigaction (SIGSEGV , & signal_struct , & PHPDBG_G (old_sigsegv_signal ));
1665
- sigaction (SIGBUS , & signal_struct , & PHPDBG_G (old_sigsegv_signal ));
1666
- #endif
1667
-
1668
1660
PHPDBG_G (sapi_name_ptr ) = sapi_name ;
1669
1661
1670
1662
if (exec ) { /* set execution context */
@@ -1701,6 +1693,14 @@ int main(int argc, char **argv) /* {{{ */
1701
1693
return 1 ;
1702
1694
}
1703
1695
1696
+ #if defined(ZEND_SIGNALS ) && !defined(_WIN32 )
1697
+ zend_try { zend_sigaction (SIGSEGV , & signal_struct , & PHPDBG_G (old_sigsegv_signal )); } zend_end_try ();
1698
+ zend_try { zend_sigaction (SIGBUS , & signal_struct , & PHPDBG_G (old_sigsegv_signal )); } zend_end_try ();
1699
+ #elif !defined(_WIN32 )
1700
+ sigaction (SIGSEGV , & signal_struct , & PHPDBG_G (old_sigsegv_signal ));
1701
+ sigaction (SIGBUS , & signal_struct , & PHPDBG_G (old_sigsegv_signal ));
1702
+ #endif
1703
+
1704
1704
/* do not install sigint handlers for remote consoles */
1705
1705
/* sending SIGINT then provides a decent way of shutting down the server */
1706
1706
#ifndef _WIN32
0 commit comments