From: Bob Weinand <bobwei9@hotmail.com>
Date: Mon, 15 Sep 2014 03:48:09 +0000 (+0200)
Subject: Merge phpdbg into PHP-5.6
X-Git-Tag: php-5.6.3RC1~20^2~2^2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29d8aad2f65cab8d94ce6203f9cc5eb3e2691589;p=php

Merge phpdbg into PHP-5.6
---

diff --git a/.travis.yml b/.travis.yml
index d5b492e7cf..2e777fbe13 100644
--- 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 e7e5c731a8..a2a84deb7b 100644
--- 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 1fbd18a423..c881559e6e 100644
--- 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