Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  force ext_dep.js prepend to configure.js in phpize mode
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6
  Update LiteSpeed SAPI code to V6.4

2 files changed, 2 insertions, 5 deletions

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index bfe363d96d..b034b6da6d 100644
--- a/win32/build/confutils.js
+++ b/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);

 

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"));