summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2019-10-09 17:28:33 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2019-10-09 17:28:50 +0200
commitbbd481c11da657c8a4e7f764ec0953e3d71c2f4a (patch)
treec8153fc17efc41c07f45f039dc130bdfb287552a
parent6fd6ad8f53f68154fa23de25f400d89ae29d54d0 (diff)
parent3164186d53533ac5239790e692b33dd6e56c18df (diff)
downloadphp-git-bbd481c11da657c8a4e7f764ec0953e3d71c2f4a.tar.gz
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2: Fix #78656: Parse errors classified as highest log-level
-rw-r--r--NEWS2
-rw-r--r--main/main.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index e96d88f4c1..facfaf0724 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ PHP NEWS
- Core:
. Fixed bug #78658 (Memory corruption using Closure::bindTo). (Nikita)
+ . Fixed bug #78656 (Parse errors classified as highest log-level). (Erik
+ Lundin)
- Iconv:
. Fixed bug #78642 (Wrong libiconv version displayed). (gedas at martynas,
diff --git a/main/main.c b/main/main.c
index f729c2e275..6917fe3230 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1297,7 +1297,7 @@ static ZEND_COLD void php_error_cb(int type, const char *error_filename, const u
break;
case E_PARSE:
error_type_str = "Parse error";
- syslog_type_int = LOG_EMERG;
+ syslog_type_int = LOG_ERR;
break;
case E_NOTICE:
case E_USER_NOTICE: