Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport

* origin/PHP-5.6: (131 commits)
  Enable $ replacement in exif, ldap, pdo_pgsql and tidy
  See bug #67635
  NEWS
  NEWS
  improve previous, add message during configure
  Fixed bug #67635 php links to systemd libraries without using pkg-config
  Improve fix for #66608
  Fixed segfault with empty break
  New added opcodes don't need to be resloved
  Update NEWS
  Update NEWS
  Update NEWS
  Fixed bug #66827 Session raises E_NOTICE when session name variable is array
  implemented copy libs of core exts in phpize mode
  fix copy the ext dll into the prefix path in phpize mode
  fix default prefix in phpize mode
  fix file with zero size usage in phpize mode
  Update NEWS
  Fixed bug #66608 (Incorrect behavior with nested "finally" blocks)
  Enable build without atoll (e.g old AIX flavours)
  ...

Conflicts:
	Zend/zend_opcode.c
	ext/date/php_date.c
	ext/mysqli/mysqli.c
	ext/pgsql/pgsql.c
	ext/session/session.c
	ext/spl/spl_array.c
	ext/standard/http_fopen_wrapper.c
	ext/standard/string.c
	sapi/litespeed/lsapi_main.c

1 files changed, 177 insertions, 9 deletions

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 1dbc75b280..203013e2f0 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -1024,6 +1024,11 @@ function is_pgo_desired(mod)
 {

 	var varname = "PHP_" + mod.toUpperCase() + "_PGO";

 

+	/* XXX enable PGO in phpize mode */

+	if (MODE_PHPIZE) {

+		return false;

+	}

+

 	/* don't disable if there's no mention of the varname */

 	if (eval("typeof " + varname + " == 'undefined'")) {

 		return true;

@@ -1165,11 +1170,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);

 

@@ -1203,9 +1203,14 @@ function ADD_EXTENSION_DEP(extname, dependson, optional)
 			ERROR("static " + extname + " cannot depend on shared " + dependson);

 		}

 

-		ADD_FLAG("LDFLAGS_" + EXT, "/libpath:$(BUILD_DIR)");

 		ADD_FLAG("LIBS_" + EXT, "php_" + dependson + ".lib");

-		ADD_FLAG("DEPS_" + EXT, "$(BUILD_DIR)\\php_" + dependson + ".lib");

+		if (MODE_PHPIZE) {

+			ADD_FLAG("LDFLAGS_" + EXT, "/libpath:$(BUILD_DIR_DEV)\\lib");

+			ADD_FLAG("DEPS_" + EXT, "$(BUILD_DIR_DEV)\\lib\\php_" + dependson + ".lib");

+		} else {

+			ADD_FLAG("LDFLAGS_" + EXT, "/libpath:$(BUILD_DIR)");

+			ADD_FLAG("DEPS_" + EXT, "$(BUILD_DIR)\\php_" + dependson + ".lib");

+		}

 

 	} else {

 

@@ -1356,6 +1361,9 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir)
 	

 		DEFINE('CFLAGS_' + EXT + '_OBJ', '$(CFLAGS_PHP) $(CFLAGS_' + EXT + ')');

 	}

+	if (MODE_PHPIZE && FSO.FileExists(PHP_DIR + "/include/main/config.pickle.h")) {

+		cflags = "/FI main/config.pickle.h " + cflags;

+	}

 	ADD_FLAG("CFLAGS_" + EXT, cflags);

 

 	if (PHP_DSP != "no") {

@@ -1520,7 +1528,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;

 	}

@@ -1672,6 +1680,9 @@ function generate_files()
 		generate_internal_functions();

 		generate_config_h();

 		generate_phpize();

+	} else {

+		generate_config_pickle_h();

+		generate_ext_pickle();

 	}

 	STDOUT.WriteLine("Done.");

 	STDOUT.WriteBlankLines(1);

@@ -1684,6 +1695,140 @@ function generate_files()
 	}

 }

 

+function generate_ext_pickle()

+{

+	var content;

+	var DEPS = null;

+	var dest;

+	var deps_lines = new Array();

+

+	var build_var_name = function(name) {

+		return "PHP_" + name.toUpperCase();

+	}

+

+	STDOUT.WriteLine("Generating pickle deps");

+	dest = PHP_DIR + "/script/";

+

+	if (!FSO.FolderExists(dest)) {

+		FSO.CreateFolder(dest);

+	}

+

+	if (FSO.FileExists(dest + "/ext_pickle.js")) {

+		DEPS = FSO.OpenTextFile(dest + "/ext_pickle.js", 1);

+

+		while (!DEPS.AtEndOfStream) {

+			var ln = DEPS.ReadLine();

+			var found = false;

+

+			for (var i in extensions_enabled) {

+				var reg0 = new RegExp(build_var_name(extensions_enabled[i][0]) + "\s*=.+", "g");

+				var reg1 = new RegExp(build_var_name(extensions_enabled[i][0]) + "_SHARED" + "\s*=.+", "g");

+

+				if (ln.match(reg1) || ln.match(reg0)) {

+					found = true;

+					break;

+				}

+			}

+

+			if (!found) {

+				deps_lines.push(ln);

+			}

+		}

+	}

+

+	for (var i in extensions_enabled) {

+		deps_lines.push(build_var_name(extensions_enabled[i][0]) + "=true;");

+		deps_lines.push(build_var_name(extensions_enabled[i][0]) + "_SHARED=" + (extensions_enabled[i][1] == 'shared' ? 'true' : 'false') + ";");

+	}

+

+	if (!!DEPS) {

+		DEPS.Close();

+		DEPS = null;

+	}

+

+	/* Replace the ext_pickle.js with the new content */

+	DEPS = FSO.CreateTextFile(dest + "/ext_pickle.js", true);

+

+	for (var j in deps_lines) {

+		DEPS.WriteLine(deps_lines[j]);

+	}

+

+	DEPS.Close();

+}

+

+function generate_config_pickle_h()

+{

+	var outfile = null;

+	var lines = new Array();

+	var keys = (new VBArray(configure_hdr.Keys())).toArray();

+	dest = PHP_DIR + "/include/main";

+

+	var ignore_key = function(key) {

+		var ignores = [ "CONFIGURE_COMMAND", "PHP_COMPILER_ID", "COMPILER", "ARCHITECTURE", "HAVE_STRNLEN", "PHP_DIR" ];

+

+		for (var k in ignores) {

+			if (ignores[k] == key) {

+				return true;

+			}

+		}

+

+		return false;

+	}

+

+

+	STDOUT.WriteLine("Generating main/config.pickle.h");

+

+	if (FSO.FileExists(dest + "/config.pickle.h")) {

+		outfile = FSO.OpenTextFile(dest + "/config.pickle.h", 1);

+

+		while (!outfile.AtEndOfStream) {

+			var found = false;

+			var ln = outfile.ReadLine();

+

+			for (var i in keys) {

+				var reg = new RegExp("#define[\s ]+" + keys[i] + "[\s ]*.*", "g");

+

+				if (ln.match(reg)) {

+					found = true;

+					break;

+				}

+			}

+

+			if (!found) {

+				lines.push(ln);

+			}

+		}

+	}

+

+	for (var i in keys) {

+		var item = configure_hdr.Item(keys[i]);

+

+		if (ignore_key(keys[i])) {

+			continue;

+		}

+

+		/* XXX fix comment handling */

+		/*if (!lines[j].match(/^#define.+/g)) {

+			continue;

+		}*/

+

+		lines.push("#define " + keys[i] + " " + item[0]);

+	}

+

+	if (outfile) {

+		outfile.Close();

+		outfile = null;

+	}

+

+	outfile = FSO.CreateTextFile(dest + "/config.pickle.h", true);

+

+	for (var k in lines) {

+		outfile.WriteLine(lines[k]);

+	}

+

+	outfile.Close();

+}

+

 function generate_config_h()

 {

 	var infile, outfile;

@@ -1757,6 +1902,7 @@ function generate_phpize()
 

 	var MF = FSO.CreateTextFile(dest + "/phpize.js", true);

 	var DEPS = FSO.CreateTextFile(dest + "/ext_deps.js", true);

+	

 	prefix = get_define("PHP_PREFIX");

 	prefix = prefix.replace(new RegExp("/", "g"), "\\");

 	prefix = prefix.replace(new RegExp("\\\\", "g"), "\\\\");

@@ -1836,13 +1982,35 @@ function generate_makefile()
 		}

 	}

 	MF.WriteLine("	@for %D in ($(INSTALL_HEADERS_DIR)) do @copy %D*.h $(BUILD_DIR_DEV)\\include\\%D /y >nul");

+	if (MODE_PHPIZE) {

+		MF.WriteBlankLines(1);

+		MF.WriteLine("build-bins:");

+		for (var i in extensions_enabled) {

+			var lib = "php_" + extensions_enabled[i][0] + ".lib";

+			var dll = "php_" + extensions_enabled[i][0] + ".dll";

+			MF.WriteLine("	@copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");

+			MF.WriteLine("	@copy $(BUILD_DIR)\\" + dll + " $(PHP_PREFIX)");

+		}

+	} else {

+		MF.WriteBlankLines(1);

+		MF.WriteLine("build-ext-libs:");

+		for (var i in extensions_enabled) {

+			var lib = "php_" + extensions_enabled[i][0] + ".lib";

+

+			if ('shared' == extensions_enabled[i][1]) {

+				MF.WriteLine("	@copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");

+			}

+		}

+	}

 	TF.Close();

 

 	MF.WriteBlankLines(2);

 

 	MFO.Close();

 	TF = FSO.OpenTextFile("Makefile.objects", 1);

-	MF.Write(TF.ReadAll());

+	if (!TF.AtEndOfStream) {

+		MF.Write(TF.ReadAll());

+	}

 	TF.Close();

 

 	MF.Close();