diff options
| author | Kevin Abel <kevin.abel.0@gmail.com> | 2018-07-08 21:18:20 -0500 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-01-30 18:27:57 +0100 |
| commit | 3890c8bce5f46c59d7c57e2c2ea10d2cc8b44ce1 (patch) | |
| tree | 854bb82bb1c57a73bd6a1a94d8beac1d23aea819 | |
| parent | cbc5a141f78f873be408e44a0658ea789b9cd365 (diff) | |
| download | php-git-3890c8bce5f46c59d7c57e2c2ea10d2cc8b44ce1.tar.gz | |
Fix bug 76596: phpdbg supports display_errors=stderr
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | main/main.c | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -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); |