diff options
author | Xinchen Hui <laruence@php.net> | 2013-12-30 11:07:37 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@php.net> | 2013-12-30 11:07:37 +0800 |
commit | 5a756afcf14fada75f6ed8052cd97924dd229ed8 (patch) | |
tree | 591d49381a3142b35ebcd6a0aa5932accacc1843 | |
parent | 31d4d11432983b441832863983ae6e9d1dd614ba (diff) | |
parent | ed5be4f7ad9255f13f0e1263e0b88181dc3c31d8 (diff) | |
download | php-git-5a756afcf14fada75f6ed8052cd97924dd229ed8.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
-rw-r--r-- | ext/opcache/tests/blacklist.phpt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/opcache/tests/blacklist.phpt b/ext/opcache/tests/blacklist.phpt index 57e4c306dd..18c205cacf 100644 --- a/ext/opcache/tests/blacklist.phpt +++ b/ext/opcache/tests/blacklist.phpt @@ -4,6 +4,7 @@ Blacklist (with glob, quote and comments) opcache.enable=1 opcache.enable_cli=1 opcache.blacklist_filename={PWD}/opcache-*.blacklist +opcache.file_update_protection=0 --SKIPIF-- <?php require_once('skipif.inc'); ?> --FILE-- |