Output stderr on real stderr in phpdbg

bwoebi · bwoebi · commit c1189eccae3c · 2015-11-23T17:46:07.000+01:00
diff --git 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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -916,7 +916,7 @@ static size_t phpdbg_stdiop_write(php_stream stream, const char buf, size_t co`
`916`	`916`	`return count;`
`917`	`917`	`}`
`918`	`918`	`if (stat[2].st_dev == stat[1].st_dev && stat[2].st_ino == stat[1].st_ino) {`
`919`		`- phpdbg_script(P_STDERR, "%.*s", (int) count, buf);`
	`919`	`+ phpdbg_script_ex(PHPDBG_G(io)[PHPDBG_STDERR].fd, P_STDERR, "%.*s", (int) count, buf);`
`920`	`920`	`return count;`
`921`	`921`	`}`
`922`	`922`	`break;`