diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-09-24 08:54:56 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-09-24 08:55:12 +0200 |
| commit | 76b2b4a190c8a5ab264df36cf1ccdb9ddd3686ad (patch) | |
| tree | c299096d8bf885b6e0aae83b7caab21386fc853d /main | |
| parent | 28391b9e7fa82616a63c3393754e19dd2ad7ebbd (diff) | |
| parent | 628c257f713224663567a35b3da781153829a413 (diff) | |
| download | php-git-76b2b4a190c8a5ab264df36cf1ccdb9ddd3686ad.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/main/main.c b/main/main.c index 4745b34e46..a84f7cdb6f 100644 --- a/main/main.c +++ b/main/main.c @@ -1242,9 +1242,7 @@ static ZEND_COLD void php_error_cb(int type, const char *error_filename, const u sapi_header_op(SAPI_HEADER_REPLACE, &ctr); } /* the parser would return 1 (failure), we can bail out nicely */ - if (type == E_PARSE) { - CG(parse_error) = 0; - } else { + if (type != E_PARSE) { /* restore memory limit */ zend_set_memory_limit(PG(memory_limit)); efree(buffer); |