Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
	ext/opcache/Optimizer/pass1_5.c

diff --cc .gitignore
Simple merge

diff --cc ext/opcache/Optimizer/pass1_5.c
index 5ea10a88d840f369b97fdb4ecbb471159b68d7ab,f252117de74af7a6c9e2598befaccb0e533ccac9..7e0d14ac608422708e764835016336738c2ea03f
--- 1/ext/opcache/Optimizer/pass1_5.c
--- 2/ext/opcache/Optimizer/pass1_5.c
+++ b/ext/opcache/Optimizer/pass1_5.c
@@@ -42,7 -16,9 +42,9 @@@ void zend_optimizer_pass1(zend_op_arra
        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 == &script->main_op_array); */
++      zend_bool collect_constants = (op_array == &ctx->script->main_op_array); */
+       zend_bool collect_constants = 0;
  
        while (opline < end) {
                switch (opline->opcode) {

diff --cc main/internal_functions_win32.c
Simple merge

diff --cc php.ini-development
Simple merge

diff --cc php.ini-production
Simple merge