diff options
| author | Remi Collet <remi@php.net> | 2014-09-15 08:28:22 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-09-15 08:28:22 +0200 |
| commit | 06f8879017151f4993d2e369815b1223cb72af94 (patch) | |
| tree | b28b0575f3fd0ef808e0a7271028e03674c45f60 /sapi/phpdbg/phpdbg.c | |
| parent | 32c46f44a808c792b98b1b222dca43d7a6d4c864 (diff) | |
| parent | a390d579bba16c8fc202103aefa7f41915b12a31 (diff) | |
| download | php-git-06f8879017151f4993d2e369815b1223cb72af94.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in ee275e34c8b303945945c650d4bc90dcc2ac0b17
Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in ee275e34c8b303945945c650d4bc90dcc2ac0b17
Fix bug #111 (compile error without ZEND_SIGNALS)
Don't run travis against master (phpng)
Update README.md
Diffstat (limited to 'sapi/phpdbg/phpdbg.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 6fe06a9f65..c10af61e1a 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1296,14 +1296,14 @@ phpdbg_main: /* do not install sigint handlers for remote consoles */ /* sending SIGINT then provides a decent way of shutting down the server */ -#if defined(ZEND_SIGNALS) && !defined(_WIN32) - if (listen[0] < 0) { - zend_try { zend_signal(SIGINT, phpdbg_sigint_handler TSRMLS_CC); } zend_end_try(); - } -#elif !defined(_WIN32) +#ifndef _WIN32 if (listen[0] < 0) { #endif +#if defined(ZEND_SIGNALS) && !defined(_WIN32) + zend_try { zend_signal(SIGINT, phpdbg_sigint_handler TSRMLS_CC); } zend_end_try(); +#else signal(SIGINT, phpdbg_sigint_handler); +#endif #ifndef _WIN32 } #endif |