diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-12-17 14:30:00 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-12-17 14:30:00 +0800 |
| commit | 9374977d215be414d6e2e98b041a2b8f9b9a1e8d (patch) | |
| tree | 15b28cb867460a81ac1956cd8c241cd23e1c9827 | |
| parent | c7c3b967a550b4f1137d6a7b2bf56ec1e4f6dbbd (diff) | |
| parent | 940c68b55d4241f9f34d4f71064f5f12a44e8d3d (diff) | |
| download | php-git-9374977d215be414d6e2e98b041a2b8f9b9a1e8d.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/opcache/Optimizer/pass1_5.c
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | ext/opcache/Optimizer/pass1_5.c | 4 | ||||
| -rw-r--r-- | ext/opcache/tests/bug71127.phpt | 24 | ||||
| -rw-r--r-- | main/internal_functions_win32.c | 6 | ||||
| -rw-r--r-- | php.ini-development | 4 | ||||
| -rw-r--r-- | php.ini-production | 4 |
6 files changed, 27 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore index 4e5cfa7c60..a00615f966 100644 --- a/.gitignore +++ b/.gitignore @@ -245,10 +245,6 @@ ext/reflection/spl.chm ext/simplexml/examples/security.new.xml ext/spl/examples/.htaccess ext/spl/examples/*.phps -ext/sqlite/weztest.sqlite -ext/sqlite/libsqlite/src/sqlite.h -ext/sqlite/libsqlite/src/parse.out -ext/sqlite/libsqlite/src/libsqlite.dsw ext/sqlite3/tests/phpsql* ext/sqlite3/tests/*.db ext/sqlite3/tests/*.tmp diff --git a/ext/opcache/Optimizer/pass1_5.c b/ext/opcache/Optimizer/pass1_5.c index 5ea10a88d8..7e0d14ac60 100644 --- a/ext/opcache/Optimizer/pass1_5.c +++ b/ext/opcache/Optimizer/pass1_5.c @@ -42,7 +42,9 @@ void zend_optimizer_pass1(zend_op_array *op_array, zend_optimizer_ctx *ctx) int i = 0; zend_op *opline = op_array->opcodes; zend_op *end = opline + op_array->last; - zend_bool collect_constants = (op_array == &ctx->script->main_op_array); + /* bug #71127* + zend_bool collect_constants = (op_array == &ctx->script->main_op_array); */ + zend_bool collect_constants = 0; while (opline < end) { switch (opline->opcode) { diff --git a/ext/opcache/tests/bug71127.phpt b/ext/opcache/tests/bug71127.phpt new file mode 100644 index 0000000000..78c5535062 --- /dev/null +++ b/ext/opcache/tests/bug71127.phpt @@ -0,0 +1,24 @@ +--TEST-- +Bug #71127 (Define in auto_prepend_file is overwrite) +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +--SKIPIF-- +<?php if (!extension_loaded('Zend OPcache')) die("skip"); ?> +--FILE-- +<?php +$file = __DIR__ . "/bug71127.inc"; + +file_put_contents($file, "<?php define('FOO', 'bad'); echo FOO;?>"); + +define("FOO", "okey"); + +include($file); +?> +--CLEAN-- +<?php +@unlink(__DIR__ . "/bug71127.inc"); +?> +--EXPECTF-- +Notice: Constant FOO already defined in %sbug71127.inc on line %d +okey diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c index 45baf802c0..68633bcdc8 100644 --- a/main/internal_functions_win32.c +++ b/main/internal_functions_win32.c @@ -97,9 +97,6 @@ #if HAVE_XML && HAVE_WDDX #include "ext/wddx/php_wddx.h" #endif -#ifdef HAVE_SQLITE -#include "ext/sqlite/php_sqlite.h" -#endif #include "ext/com_dotnet/php_com_dotnet.h" #ifdef HAVE_SPL #include "ext/spl/php_spl.h" @@ -172,9 +169,6 @@ static zend_module_entry *php_builtin_extensions[] = { #if HAVE_XML && HAVE_WDDX ,phpext_wddx_ptr #endif -#if HAVE_SQLITE - ,phpext_sqlite_ptr -#endif #if HAVE_SPL ,phpext_spl_ptr #endif diff --git a/php.ini-development b/php.ini-development index 801c1b63d4..2224309925 100644 --- a/php.ini-development +++ b/php.ini-development @@ -956,10 +956,6 @@ cli_server.color = On ; Default is 0, which does not produce any errors. ;intl.error_level = E_WARNING -[sqlite] -; http://php.net/sqlite.assoc-case -;sqlite.assoc_case = 0 - [sqlite3] ;sqlite3.extension_dir = diff --git a/php.ini-production b/php.ini-production index 521ded662b..a7cacb5648 100644 --- a/php.ini-production +++ b/php.ini-production @@ -956,10 +956,6 @@ cli_server.color = On ; Default is 0, which does not produce any errors. ;intl.error_level = E_WARNING -[sqlite] -; http://php.net/sqlite.assoc-case -;sqlite.assoc_case = 0 - [sqlite3] ;sqlite3.extension_dir = |