com php-src: Merge branch 'PHP-7.3' into PHP-7.4: ext/opcache/t ests/zzz_basic_logging.phpt
| From: | Christoph Michael Becker | Date: | Mon, 20 May 2019 09:11:06 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.3' into PHP-7.4: ext/opcache/t ests/zzz_basic_logging.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-106245@lists.php.net to get a copy of this message | ||
Commit: 5f1d76a2c410fb5ea0c40fe570402bbef30b87d6
Author: Christoph M. Becker <cmbecker69@gmx.de> Mon, 20 May 2019 11:11:06 +0200
Parents: e11233dc492a96844d22e4a3ed8e9e2d8a36651c db8ef71353cd5770860e37afd94001926ba575a0
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5f1d76a2c410fb5ea0c40fe570402bbef30b87d6
Log:
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix test wrt. opcache.error_log
Changed paths:
MM ext/opcache/tests/zzz_basic_logging.phpt
Diff:
diff --cc ext/opcache/tests/zzz_basic_logging.phpt
index e799bc6,778857d..bf04b50
--- a/ext/opcache/tests/zzz_basic_logging.phpt
+++ b/ext/opcache/tests/zzz_basic_logging.phpt
@@@ -7,9 -7,9 +7,10 @@@ outputs the correct logging at the high
opcache..enable=1
opcache.enable_cli=1
opcache.file_cache_only=0
+ opcache.error_log=
opcache.log_verbosity_level=4
opcache.huge_code_pages=0
+opcache.preload=
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--FILE--