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

win32/build/Makefile.phpize

@@ -5,10 +5,7 @@ MT="$(MT)"
 
 PHPSDK_DIR=$(PHP_DIR)
 PHPLIB=$(PHPSDK_DIR)\lib\$(PHPLIB)
-LDFLAGS=/libpath:"$(PHPSDK_DIR)\lib\;$(PHPSDK_DIR)"
-
-CFLAGS=/nologo /FD $(BASE_INCLUDES) /D _WINDOWS /D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D_USE_32BIT_TIME_T=1 /D ZEND_WIN32_FORCE_INLINE /GF /D ZEND_DEBUG=0 /D ZTS=1 /D FD_SETSIZE=256 
-CFLAGS_PHP=/D _USRDLL /D PHP5DLLTS_EXPORTS /D PHP_EXPORTS /D TSRM_EXPORTS /D SAPI_EXPORTS /D WINVER=0x500 /D COMPILE_DL_AJAXMIN 
+LDFLAGS=$(LDFLAGS) /libpath:"$(PHPSDK_DIR)\lib\;$(PHPSDK_DIR)"
 
 all: $(EXT_TARGETS) $(PECL_TARGETS)
 

win32/build/confutils.js

@@ -1168,11 +1168,6 @@ function ADD_EXTENSION_DEP(extname, dependson, optional)
 	var dep_present = false;
 	var dep_shared = false;
 
-	if (MODE_PHPIZE) {
-		ext_deps_js = file_get_contents(PHP_DIR + "\\script\\ext_deps.js");
-		eval(ext_deps_js);
-	}
-
 	try {
 		dep_present = eval("PHP_" + DEP);
 
@@ -1518,7 +1513,7 @@ function output_as_table(header, ar_out)
 	var min = new Array(l);
 	var max = new Array(l);
 
-	if (l != ar_out[0].length) {
+	if (!!ar_out[0] && l != ar_out[0].length) {
 		STDOUT.WriteLine("Invalid header argument, can't output the table " + l + " " + ar_out[0].length  );
 		return;
 	}
@@ -1826,7 +1821,9 @@ function generate_makefile()
 
 	MFO.Close();
 	TF = FSO.OpenTextFile("Makefile.objects", 1);
-	MF.Write(TF.ReadAll());
+	if (!TF.AtEndOfStream) {
+		MF.Write(TF.ReadAll());
+	}
 	TF.Close();
 
 	MF.Close();	

win32/build/phpize.js.in

@@ -209,6 +209,8 @@ C.WriteLine("/* This file automatically generated from script/confutils.js */");
 C.WriteLine("var MODE_PHPIZE = true;");
 C.WriteLine("var PHP_DIR = " + '"' + PHP_DIR.replace(new RegExp('(["\\\\])', "g"), '\\$1') + '"');
 
+C.Write(file_get_contents(PHP_DIR + "//script//ext_deps.js"));
+
 C.Write(file_get_contents(PHP_DIR + "/script/confutils.js"));
 C.Write(file_get_contents(PHP_DIR + "/script/config.phpize.js"));