From: Kevin Abel <kevin.abel.0@gmail.com>
Date: Mon, 9 Jul 2018 02:18:20 +0000 (-0500)
Subject: Fix bug 76596: phpdbg supports display_errors=stderr
X-Git-Tag: php-7.2.16RC1~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3890c8bce5f46c59d7c57e2c2ea10d2cc8b44ce1;p=php

Fix bug 76596: phpdbg supports display_errors=stderr
---

diff --git a/NEWS b/NEWS
index 4dcddb1735..f3c3063ac7 100644
--- a/NEWS
+++ b/NEWS
@@ -45,6 +45,9 @@ PHP                                                                        NEWS
   . Fixed bug #77273 (array_walk_recursive corrupts value types leading to PDO
     failure). (Nikita)
 
+- phpdbg:
+  . Fixed bug #76596 (phpdbg support for display_errors=stderr). (kabel)
+
 - Sockets:
   . Fixed bug #76839 (socket_recvfrom may return an invalid 'from' address
     on MacOS). (Michael Meyer)
diff --git a/main/main.c b/main/main.c
index a7452e9f04..d68cb6eca4 100644
--- a/main/main.c
+++ b/main/main.c
@@ -395,7 +395,7 @@ static PHP_INI_DISP(display_errors_mode)
 	mode = php_get_display_errors_mode(tmp_value, tmp_value_length);
 
 	/* Display 'On' for other SAPIs instead of STDOUT or STDERR */
-	cgi_or_cli = (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "cgi"));
+	cgi_or_cli = (!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "cgi") || !strcmp(sapi_module.name, "phpdbg"));
 
 	switch (mode) {
 		case PHP_DISPLAY_ERRORS_STDERR:
@@ -1181,7 +1181,7 @@ static ZEND_COLD void php_error_cb(int type, const char *error_filename, const u
 					}
 				} else {
 					/* Write CLI/CGI errors to stderr if display_errors = "stderr" */
-					if ((!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "cgi")) &&
+					if ((!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "cgi") || !strcmp(sapi_module.name, "phpdbg")) &&
 						PG(display_errors) == PHP_DISPLAY_ERRORS_STDERR
 					) {
 						fprintf(stderr, "%s: %s in %s on line %u\n", error_type_str, buffer, error_filename, error_lineno);