Merge phpdbg into PHP-5.6

diff --git a/phpdbg_wait.c b/phpdbg_wait.c
index a8c7dd49cb2705ffd632ac2eaccf3cfd0d841a64..3f5ee24faaf8e79000a211b18ecf47f0e26a7468 100644 (file)
--- 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
 } /* }}} */