diff options
| author | Anatol Belski <ab@php.net> | 2014-10-29 20:04:56 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-29 20:04:56 +0100 |
| commit | d77ce317636919a87daa7f8ffb2979474f9cade7 (patch) | |
| tree | c9ebe2c7ad01661e7696a8f15d6d4842870f03ea /sapi/phpdbg/phpdbg_wait.c | |
| parent | 23f089a6b3586d524e8709d75262029bc8fa7ad4 (diff) | |
| parent | fc904569ea5c5513925a69bf43820845eb3db104 (diff) | |
| download | php-git-d77ce317636919a87daa7f8ffb2979474f9cade7.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix output globals importing
export output globals
use portable strndup implementation
unix sockets aren't available on windows
dll export APIs needed by phpdbg
fix sapi/phpdbg/config.w32
Don't treat warnings as failures in the junit output
Diffstat (limited to 'sapi/phpdbg/phpdbg_wait.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_wait.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sapi/phpdbg/phpdbg_wait.c b/sapi/phpdbg/phpdbg_wait.c index a8cf7491c4..a76dda88e4 100644 --- a/sapi/phpdbg/phpdbg_wait.c +++ b/sapi/phpdbg/phpdbg_wait.c @@ -344,6 +344,7 @@ void phpdbg_webdata_decompress(char *msg, int len TSRMLS_DC) { PHPDBG_COMMAND(wait) /* {{{ */ { +#ifndef PHP_WIN32 struct sockaddr_un local, remote; int rlen, sr, sl; unlink(PHPDBG_G(socket_path)); @@ -393,6 +394,7 @@ PHPDBG_COMMAND(wait) /* {{{ */ efree(data); phpdbg_notice("wait", "import=\"success\"", "Successfully imported request data, stopped before executing"); +#endif return SUCCESS; } /* }}} */ |