Merge phpdbg into PHP-5.6

diff --git a/.travis.yml b/.travis.yml
index d5b492e7cfaa090e9fc78b17755ec07ff970d9cb..2e777fbe13d7f361a7a4675cd0e78794340ebc0f 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,6 @@ env:
 - PHP="PHP-5.4"
 - PHP="PHP-5.5"
 - PHP="PHP-5.6"
-- PHP="master"
 
 before_script: ./travis/ci.sh
 

diff --git a/README.md b/README.md
index e7e5c731a805ceb4cdb68d03fba4cdc66fcaab53..a2a84deb7b12b81564e919934ac9fa7d09d8e3cd 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 The interactive PHP debugger
 ============================
 
-Implemented as a SAPI module, phpdbg can excert complete control over the environment without impacting the functionality or performance of your code.
+Implemented as a SAPI module, phpdbg can exert complete control over the environment without impacting the functionality or performance of your code.
 
 phpdbg aims to be a lightweight, powerful, easy to use debugging platform for PHP 5.4+
 

diff --git a/phpdbg.c b/phpdbg.c
index 1fbd18a423a59d67bfa02f6e254160e1ed0e62c2..c881559e6edbcc582821c29cd7c3f74ceed751c6 100644 (file)
--- a/phpdbg.c
+++ b/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