diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-10-27 13:11:13 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-10-27 13:11:13 +0100 |
| commit | 6eab2b910120e0ff5f0cdbbeac9be02e13312497 (patch) | |
| tree | 08d7517c71e5726cda6cb3b5f9cfd37f900f6b5d /sapi/phpdbg/phpdbg.c | |
| parent | cc91072f0ef69b5884f23eb758ef6e12e8858034 (diff) | |
| parent | b4db856d374d0df47e902b65639ab9a06346aa8a (diff) | |
| download | php-git-6eab2b910120e0ff5f0cdbbeac9be02e13312497.tar.gz | |
Merge phpdbg into PHP-5.6
Conflicts:
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_prompt.c
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 b7fb5e5afc..9c56b1d7bc 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1343,7 +1343,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); @@ -1466,7 +1466,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; |