Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Fixed ext/intl/tests/timezone_createDefault_basic.phpt
  Skip test if directory does not exist
  Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
  Fixed test sapi/cli/tests/006.phpt
  Fixed compiler reenterability
  Fixed compiler reenterability
  Updated NEWS
  UPdated NEWS
  Updated NEWS

NEWS

@@ -181,4 +181,7 @@ PHP                                                                        NEWS
   . Fixed bug #63248 (Load multiple magic files from a directory under Windows).
       (Anatoliy)
 
+- Apache2 Handler SAPI:
+  . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy)
+
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>

UPGRADING

@@ -13,7 +13,8 @@ PHP X.Y UPGRADE NOTES
 8. Other Changes to Extensions
 9. New Global Constants
 10. Changes to INI File Handling
-11. Other Changes
+11. Windows Support
+12. Other Changes
 
 
 ========================================
@@ -247,9 +248,15 @@ PHP X.Y UPGRADE NOTES
     APIs which use(are built) for mysqlnd. This allows ext/mysqli to be used
 	with the new auth protocol, although at coarser level.
 
+========================================
+11. Windows Support
+========================================
+
+- Apache 2.4 handler is supported as of PHP 5.5.0
+
 
 ========================================
-11. Other Changes
+12. Other Changes
 ========================================
 
 - Logo GUIDs will no longer work

Zend/zend_compile.c

@@ -219,6 +219,7 @@ ZEND_API void file_handle_dtor(zend_file_handle *fh) /* {{{ */
 void init_compiler(TSRMLS_D) /* {{{ */
 {
 	CG(active_op_array) = NULL;
+	memset(&CG(context), 0, sizeof(CG(context)));
 	zend_init_compiler_data_structures(TSRMLS_C);
 	zend_init_rsrc_list(TSRMLS_C);
 	zend_hash_init(&CG(filenames_table), 5, NULL, (dtor_func_t) free_estring, 0);

Zend/zend_language_scanner.l

@@ -580,6 +580,7 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR
 		init_op_array(op_array, ZEND_USER_FUNCTION, INITIAL_OP_ARRAY_SIZE TSRMLS_CC);
 		CG(in_compilation) = 1;
 		CG(active_op_array) = op_array;
+		zend_stack_push(&CG(context_stack), (void *) &CG(context), sizeof(CG(context)));
 		zend_init_compiler_context(TSRMLS_C);
 		compiler_result = zendparse(TSRMLS_C);
 		zend_do_return(&retval_znode, 0 TSRMLS_CC);
@@ -749,6 +750,7 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC)
 		init_op_array(op_array, ZEND_EVAL_CODE, INITIAL_OP_ARRAY_SIZE TSRMLS_CC);
 		CG(interactive) = orig_interactive;
 		CG(active_op_array) = op_array;
+		zend_stack_push(&CG(context_stack), (void *) &CG(context), sizeof(CG(context)));
 		zend_init_compiler_context(TSRMLS_C);
 		BEGIN(ST_IN_SCRIPTING);
 		compiler_result = zendparse(TSRMLS_C);

Zend/zend_language_scanner_defs.h

@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon Aug 20 13:34:50 2012 */
+/* Generated by re2c 0.13.5 on Wed Nov 14 17:50:16 2012 */
 #line 3 "Zend/zend_language_scanner_defs.h"
 
 enum YYCONDTYPE {

ext/intl/tests/timezone_createDefault_basic.phpt

@@ -18,14 +18,14 @@ IntlTimeZone Object
 (
     [valid] => 1
     [id] => %s
-    [rawOffset] => %d
-    [currentOffset] => %d
+    [rawOffset] => %i
+    [currentOffset] => %i
 )
 IntlTimeZone Object
 (
     [valid] => 1
     [id] => %s
-    [rawOffset] => %d
-    [currentOffset] => %d
+    [rawOffset] => %i
+    [currentOffset] => %i
 )
-==DONE==
+==DONE==

ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt

@@ -29,6 +29,14 @@ require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
 		$expected['MYSQL_ATTR_READ_DEFAULT_GROUP']		= true;
 	}
 
+	if (extension_loaded('mysqli') && stristr(mysqli_get_client_info(), "mysqlnd")
+		|| MySQLPDOTest::getClientVersion(MySQLPDOTest::factory()) > 50605) {
+		/* XXX the MySQL client library version isn't exposed with any 
+		constants, the single possibility is to use the PDO::getAttribute().
+		This however will fail with no connection. */
+		$expected['MYSQL_ATTR_SERVER_PUBLIC_KEY']		= true;
+	}
+
 	/*
 	TODO
 

sapi/cli/tests/006.phpt

@@ -69,7 +69,7 @@ string(%d) "Extension [ <persistent> extension #%d pcre version <no_version> ] {
       - Parameters [5] {
         Parameter #0 [ <required> $pattern ]
         Parameter #1 [ <required> $subject ]
-        Parameter #2 [ <required> &$subpatterns ]
+        Parameter #2 [ <optional> &$subpatterns ]
         Parameter #3 [ <optional> $flags ]
         Parameter #4 [ <optional> $offset ]
       }

tests/security/open_basedir_001.phpt

@@ -5,6 +5,9 @@ openbase_dir runtime tightning
 if (substr(PHP_OS, 0, 3) == 'WIN') {
 	die('skip.. only for unix');
 }
+if (!is_dir("/usr/local/bin")) {
+	die('skip.. no /usr/local/bin on this machine');
+}
 --INI--
 open_basedir=/usr/local
 --FILE--