From: Bob Weinand <bobwei9@hotmail.com>
Date: Tue, 28 Oct 2014 22:06:50 +0000 (+0100)
Subject: Merge phpdbg into PHP-5.6
X-Git-Tag: php-5.6.3RC1~15^2^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=beb767dbe09dbb9cd65d5d1562b1f14e9b420911;p=php

Merge phpdbg into PHP-5.6
---

diff --git a/phpdbg_wait.c b/phpdbg_wait.c
index a8c7dd49cb..3f5ee24faa 100644
--- a/phpdbg_wait.c
+++ b/phpdbg_wait.c
@@ -366,7 +366,6 @@ void phpdbg_webdata_decompress(char *msg, int len TSRMLS_DC) {
 
 PHPDBG_COMMAND(wait) /* {{{ */
 {
-#ifdef HAVE_JSON
 	struct sockaddr_un local, remote;
 	int rlen, sr, sl;
 	unlink(PHPDBG_G(socket_path));
@@ -418,5 +417,4 @@ PHPDBG_COMMAND(wait) /* {{{ */
 	phpdbg_notice("wait", "import=\"success\"", "Successfully imported request data, stopped before executing");
 
 	return SUCCESS;
-#endif
 } /* }}} */