Merge branch 'master' into phpng

* master: (40 commits)
  Bug #67609: TLS connections fail behind HTTP proxy
  Updated NEWS for #67594
  Updated NEWS for #67594
  Fix #67594 - invisible colon should be stripped off header name
  Updated NEWS for 34407
  Updated NEWS for 34407
  Updated NEWS for 34407
  Fix for bug #34407 - ucwords and title case
  fixed broken merged code
  Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
  fixed broken merged code
  Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
  Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
  Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
  Test output relies on expose_php being on
  1.2 is a problematic float to print out Lower the default display precision for this test
  The test output is dependent on expose_php ini
  fix makefile in phpize mode
  fixe output_as_table() when no ext was enabled
  fix end of stream exception when generating makefile
  ...

Conflicts:
	ext/standard/http_fopen_wrapper.c
	ext/standard/string.c
	sapi/cli/php_cli_server.c

4 files changed, 14 insertions, 11 deletions

diff --git a/win32/build/Makefile.phpize b/win32/build/Makefile.phpize
index 17cfc90fbd..0463d332fb 100644
--- a/win32/build/Makefile.phpize
+++ b/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)

 

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 3fe8469a90..564cea2dcc 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -474,5 +474,7 @@ if (PHP_ANALYZER == "vs") {
 		pvscfg.WriteLine("preprocessor = visualcpp");
 		pvscfg.WriteLine("language = C");
 	}
+} else {
+	PHP_ANALYZER = "no"
 }
 
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 1dbc75b280..bb61a448e6 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);

 

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

 	}

@@ -1842,7 +1842,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();	

diff --git a/win32/build/phpize.js.in b/win32/build/phpize.js.in
index 4813ec0b5d..235c0816a3 100644
--- a/win32/build/phpize.js.in
+++ b/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"));