Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix bug 76596: phpdbg supports display_errors=stderr

Author: krakjoe

NEWS

@@ -57,6 +57,9 @@ PHP                                                                        NEWS
   . Implemented sqlite_stmt_readonly in PDO_SQLite. (BohwaZ)
   . Raised requirements to SQLite 3.5.0. (cmb)
 
+- phpdbg:
+  . Fixed bug #76596 (phpdbg support for display_errors=stderr). (kabel)
+
 - Sockets:
   . Fixed bug #67619 (Validate length on socket_write). (thiagooak)
 

main/main.c

@@ -554,7 +554,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:
@@ -1337,7 +1337,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 %" PRIu32 "\n", error_type_str, buffer, error_filename, error_lineno);