summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2015-11-23 17:41:01 +0100
committerBob Weinand <bobwei9@hotmail.com>2015-11-23 17:46:07 +0100
commitc1189eccae3c555ac5a8610110bb3edb80998d2c (patch)
tree115566881cb402f0c35bb9520da67fec9f649904
parent7e9f416218165f7329358e0432c6373d664c5ed7 (diff)
downloadphp-git-c1189eccae3c555ac5a8610110bb3edb80998d2c.tar.gz
Output stderr on real stderr in phpdbg
-rw-r--r--NEWS3
-rw-r--r--sapi/phpdbg/phpdbg.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index dc29b7d41b..708c3fb8bf 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,9 @@ PHP NEWS
by gcov. (Senthil)
. Fixed memory leak with LOBs. (Senthil)
+- Phpdbg:
+ . Fixed stderr being written to stdout. (Bob)
+
- SOAP:
. Fixed bug #70900 (SoapClient systematic out of memory error). (Dmitry)
. Fixed bug #70940 (Segfault in soap / type_to_string). (Remi)
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index 1fda4b7cb7..d3ed746725 100644
--- a/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@ -916,7 +916,7 @@ static size_t phpdbg_stdiop_write(php_stream *stream, const char *buf, size_t co
return count;
}
if (stat[2].st_dev == stat[1].st_dev && stat[2].st_ino == stat[1].st_ino) {
- phpdbg_script(P_STDERR, "%.*s", (int) count, buf);
+ phpdbg_script_ex(PHPDBG_G(io)[PHPDBG_STDERR].fd, P_STDERR, "%.*s", (int) count, buf);
return count;
}
break;