@@ -1242,7 +1242,7 @@ void phpdbg_signal_handler(int sig, siginfo_t *info, void *context) /* {{{ */
1242
1242
if (PHPDBG_G (sigsegv_bailout )) {
1243
1243
LONGJMP (* PHPDBG_G (sigsegv_bailout ), FAILURE );
1244
1244
}
1245
- zend_sigaction (sig , & PHPDBG_G (old_sigsegv_signal ), NULL );
1245
+ sigaction (sig , & PHPDBG_G (old_sigsegv_signal ), NULL );
1246
1246
}
1247
1247
break ;
1248
1248
}
@@ -1371,8 +1371,6 @@ int main(int argc, char **argv) /* {{{ */
1371
1371
# endif
1372
1372
#endif
1373
1373
1374
- zend_signal_startup ();
1375
-
1376
1374
ini_entries = NULL ;
1377
1375
ini_entries_len = 0 ;
1378
1376
ini_ignore = 0 ;
@@ -1669,10 +1667,6 @@ int main(int argc, char **argv) /* {{{ */
1669
1667
goto free_and_return ;
1670
1668
}
1671
1669
1672
- zend_try {
1673
- zend_signal_activate ();
1674
- } zend_end_try ();
1675
-
1676
1670
/* setup remote server if necessary */
1677
1671
if (cleaning <= 0 && listen > 0 ) {
1678
1672
server = phpdbg_open_socket (address , listen );
@@ -1681,15 +1675,15 @@ int main(int argc, char **argv) /* {{{ */
1681
1675
}
1682
1676
1683
1677
#ifndef _WIN32
1684
- zend_sigaction (SIGIO , & sigio_struct , NULL );
1678
+ sigaction (SIGIO , & sigio_struct , NULL );
1685
1679
#endif
1686
1680
1687
1681
/* set remote flag to stop service shutting down upon quit */
1688
1682
remote = 1 ;
1689
1683
#ifndef _WIN32
1690
1684
} else {
1691
1685
1692
- zend_signal (SIGHUP , phpdbg_sighup_handler );
1686
+ signal (SIGHUP , phpdbg_sighup_handler );
1693
1687
#endif
1694
1688
}
1695
1689
@@ -1758,23 +1752,23 @@ int main(int argc, char **argv) /* {{{ */
1758
1752
}
1759
1753
1760
1754
#ifndef _WIN32
1761
- zend_try { zend_sigaction (SIGSEGV , & signal_struct , & PHPDBG_G (old_sigsegv_signal )); } zend_end_try ( );
1762
- zend_try { zend_sigaction (SIGBUS , & signal_struct , & PHPDBG_G (old_sigsegv_signal )); } zend_end_try ( );
1755
+ sigaction (SIGSEGV , & signal_struct , & PHPDBG_G (old_sigsegv_signal ));
1756
+ sigaction (SIGBUS , & signal_struct , & PHPDBG_G (old_sigsegv_signal ));
1763
1757
#endif
1764
1758
1765
1759
/* do not install sigint handlers for remote consoles */
1766
1760
/* sending SIGINT then provides a decent way of shutting down the server */
1767
1761
#ifndef _WIN32
1768
1762
if (listen < 0 ) {
1769
1763
#endif
1770
- zend_try { zend_signal (SIGINT , phpdbg_sigint_handler ); } zend_end_try ( );
1764
+ signal (SIGINT , phpdbg_sigint_handler );
1771
1765
#ifndef _WIN32
1772
1766
}
1773
1767
1774
1768
/* setup io here */
1775
1769
if (remote ) {
1776
1770
PHPDBG_G (flags ) |= PHPDBG_IS_REMOTE ;
1777
- zend_signal (SIGPIPE , SIG_IGN );
1771
+ signal (SIGPIPE , SIG_IGN );
1778
1772
}
1779
1773
PHPDBG_G (io )[PHPDBG_STDIN ].ptr = stdin ;
1780
1774
PHPDBG_G (io )[PHPDBG_STDIN ].fd = fileno (stdin );
@@ -2107,7 +2101,7 @@ int main(int argc, char **argv) /* {{{ */
2107
2101
}
2108
2102
2109
2103
#ifndef _WIN32
2110
- /* force override (no zend_signals) to prevent crashes due to signal recursion in SIGSEGV/SIGBUS handlers */
2104
+ /* restore default SIGSEGV/SIGBUS handlers */
2111
2105
signal (SIGSEGV , SIG_DFL );
2112
2106
signal (SIGBUS , SIG_DFL );
2113
2107
0 commit comments