summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--buildconf.bat2
-rw-r--r--win32/build/buildconf.js2
-rw-r--r--win32/build/configure.bat2
-rw-r--r--win32/build/confutils.js2
-rw-r--r--win32/build/phpize.bat2
-rw-r--r--win32/build/phpize.js.in2
7 files changed, 9 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 34a7b6ef14..515403ebc2 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 7.4.3
+- Core:
+ . Fixed bug ##79146 (cscript can fail to run on some systems). (clarodeus)
+
- CURL:
. Fixed bug #79078 (Hypothetical use-after-free in curl_multi_add_handle()).
(cmb)
diff --git a/buildconf.bat b/buildconf.bat
index 698d80a823..004d36f42c 100644
--- a/buildconf.bat
+++ b/buildconf.bat
@@ -1,5 +1,5 @@
@echo off
-cscript /nologo win32\build\buildconf.js %*
+cscript /nologo /e:jscript win32\build\buildconf.js %*
SET PHP_BUILDCONF_PATH=%~dp0
copy %PHP_BUILDCONF_PATH%\win32\build\configure.bat %PHP_BUILDCONF_PATH% > nul
SET PHP_SDK_SCRIPT_PATH=
diff --git a/win32/build/buildconf.js b/win32/build/buildconf.js
index 7bbb800249..5a45e481fc 100644
--- a/win32/build/buildconf.js
+++ b/win32/build/buildconf.js
@@ -258,4 +258,4 @@ C.WriteBlankLines(1);
C.Write(file_get_contents("win32/build/configure.tail"));
B.WriteLine("@echo off");
-B.WriteLine("cscript /nologo configure.js %*");
+B.WriteLine("cscript /nologo /e:jscript configure.js %*");
diff --git a/win32/build/configure.bat b/win32/build/configure.bat
index 45d273dc6b..8adefd8c96 100644
--- a/win32/build/configure.bat
+++ b/win32/build/configure.bat
@@ -1,2 +1,2 @@
@echo off
-cscript /nologo configure.js %*
+cscript /nologo /e:jscript configure.js %*
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index e7193a6102..190fa8e287 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -321,7 +321,7 @@ function conf_process_args()
var i, j;
var configure_help_mode = false;
var analyzed = false;
- var nice = "cscript /nologo configure.js ";
+ var nice = "cscript /nologo /e:jscript configure.js ";
var disable_all = false;
args = WScript.Arguments;
diff --git a/win32/build/phpize.bat b/win32/build/phpize.bat
index a79885f008..2664733258 100644
--- a/win32/build/phpize.bat
+++ b/win32/build/phpize.bat
@@ -1,6 +1,6 @@
@echo off
SET PHP_BUILDCONF_PATH=%~dp0
-cscript /nologo %PHP_BUILDCONF_PATH%\script\phpize.js %*
+cscript /nologo /e:jscript %PHP_BUILDCONF_PATH%\script\phpize.js %*
IF NOT EXIST configure.bat (
echo Error generating configure script, configure script was not copied
exit /b 3
diff --git a/win32/build/phpize.js.in b/win32/build/phpize.js.in
index 032559b371..5a4a973e19 100644
--- a/win32/build/phpize.js.in
+++ b/win32/build/phpize.js.in
@@ -260,6 +260,6 @@ C.WriteBlankLines(1);
C.Write(file_get_contents(PHP_DIR + "\\script\\configure.tail"));
B.WriteLine("@echo off");
-B.WriteLine("cscript /nologo configure.js %*");
+B.WriteLine("cscript /nologo /e:jscript configure.js %*");
FSO.CopyFile(PHP_DIR + "\\script\\run-tests.php", "run-tests.php", true);