com php-src: Merge phpdbg into PHP-5.6: phpdbg_wait.c
| From: | Bob Weinand | Date: | Tue, 28 Oct 2014 22:06:50 +0000 |
| Subject: | com php-src: Merge phpdbg into PHP-5.6: phpdbg_wait.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82840@lists.php.net to get a copy of this message | ||
Commit: beb767dbe09dbb9cd65d5d1562b1f14e9b420911
Author: Bob Weinand <bobwei9@hotmail.com> Tue, 28 Oct 2014 23:06:50 +0100
Parents: 45e2dc692b9b0ad13c32444622d85c0353aaee42
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=beb767dbe09dbb9cd65d5d1562b1f14e9b420911
Log:
Merge phpdbg into PHP-5.6
Changed paths:
M phpdbg_wait.c
Diff:
diff --git a/phpdbg_wait.c b/phpdbg_wait.c
index a8c7dd4..3f5ee24 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
} /* }}} */