diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-10-27 13:19:33 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-10-27 13:19:33 +0100 |
| commit | a3ae40152490eacdced73408b9978c8ba31d0179 (patch) | |
| tree | 8843a1281853e282671797488c9d80caf337542b /sapi/phpdbg/phpdbg.c | |
| parent | 2233625e02374339a7d10876b353c158fa39a5f9 (diff) | |
| parent | 6eab2b910120e0ff5f0cdbbeac9be02e13312497 (diff) | |
| download | php-git-a3ae40152490eacdced73408b9978c8ba31d0179.tar.gz | |
Merge remote-tracking branch 'origin/PHP-5.6'
Diffstat (limited to 'sapi/phpdbg/phpdbg.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 299216fcff..43881a370f 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1325,7 +1325,7 @@ phpdbg_main: } /* setup remote server if necessary */ - if (!cleaning && listen > 0) { + if (cleaning <= 0 && listen > 0) { server = phpdbg_open_socket(address, listen TSRMLS_CC); if (-1 > server || phpdbg_remote_init(address, listen, server, &socket, &stream TSRMLS_CC) == FAILURE) { exit(0); @@ -1455,7 +1455,7 @@ phpdbg_main: if (exec) { /* set execution context */ PHPDBG_G(exec) = phpdbg_resolve_path(exec TSRMLS_CC); - PHPDBG_G(exec_len) = strlen(PHPDBG_G(exec)); + PHPDBG_G(exec_len) = strlen(exec); free(exec); exec = NULL; |