diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-10-28 23:06:50 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-10-28 23:06:50 +0100 |
| commit | a5415456d41ba63e9cf2fdc93f8e4c5fc28b42b1 (patch) | |
| tree | 9d216a3bfc4c32ac23d257fd416828f20bfd1a34 | |
| parent | be5d38976807c0e16c04fc53192ddab89d946a90 (diff) | |
| parent | 31ada13463f02e3b64f15a24f4331c865b37ac1e (diff) | |
| download | php-git-a5415456d41ba63e9cf2fdc93f8e4c5fc28b42b1.tar.gz | |
Merge phpdbg into PHP-5.6
| -rw-r--r-- | sapi/phpdbg/phpdbg_wait.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sapi/phpdbg/phpdbg_wait.c b/sapi/phpdbg/phpdbg_wait.c index a8c7dd49cb..3f5ee24faa 100644 --- a/sapi/phpdbg/phpdbg_wait.c +++ b/sapi/phpdbg/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 } /* }}} */ |