Merge branch 'master' into jsond

Author: bukka

NEWS

@@ -33,6 +33,7 @@
   . Added \u{xxxxx} Unicode Codepoint Escape Syntax. (Andrea)
   . Fixed oversight where define() did not support arrays yet const syntax did. (Andrea, Dmitry)
   . Use "integer" and "float" instead of "long" and "double" in ZPP, type hint and conversion error messages. (Andrea)
+  . Implemented FR #55428 (E_RECOVERABLE_ERROR when output buffering in output buffering handler). (Kalle)
 
 - Date:
   . Fixed day_of_week function as it could sometimes return negative values

UPGRADING

@@ -1,4 +1,4 @@
-$Id$
+$Id$
 
 PHP X.Y UPGRADE NOTES
 
@@ -52,6 +52,8 @@ PHP X.Y UPGRADE NOTES
     However, \u without a following { is unaffected, so "\u202e" won't error and
     will work the same as before.
   . zend_function.common.num_args don't include the variadic argument anymore.
+  . ob_start() no longer issues an E_ERROR, but instead an E_RECOVERABLE_ERROR in case an 
+    output buffer is created in an output buffer handler.
 
 - DBA
   . dba_delete() now returns false if the key was not found for the inifile

Zend/tests/multibyte/bug68665.phpt

@@ -0,0 +1,23 @@
+--TEST--
+Crash with Big5
+--SKIPIF--
+<?php
+if (!in_array("zend.detect_unicode", array_keys(ini_get_all()))) {
+  die("skip Requires configure --enable-zend-multibyte option");
+}
+if (!extension_loaded("mbstring")) {
+  die("skip Requires mbstring extension");
+}
+?>
+--INI--
+zend.multibyte=1
+mbstring.internal_encoding=big5
+--FILE--
+<?php
+echo '\'hello';
+?>
+
+===DONE===
+--EXPECT--
+'hello
+===DONE===

Zend/tests/variable_with_boolean_name.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Variable with boolean name
+--FILE--
+<?php
+
+${true} = 42;
+var_dump(${true});
+var_dump(${'1'});
+
+?>
+--EXPECT--
+int(42)
+int(42)

Zend/tests/variable_with_integer_name.phpt

@@ -0,0 +1,11 @@
+--TEST--
+Variable with integer name
+--FILE--
+<?php
+
+${10} = 42;
+var_dump(${10});
+
+?>
+--EXPECT--
+int(42)