Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #61459 popen_close_basic-win32 can't run sort.exe

1 files changed, 12 insertions, 1 deletions

diff --git a/ext/standard/tests/file/popen_pclose_basic-win32.phpt b/ext/standard/tests/file/popen_pclose_basic-win32.phpt
index 8c2ba4252d..b5c72560d8 100644
--- a/ext/standard/tests/file/popen_pclose_basic-win32.phpt
+++ b/ext/standard/tests/file/popen_pclose_basic-win32.phpt
@@ -28,7 +28,18 @@ pclose($file_handle);
 
 echo "*** Testing popen(): writing to the pipe ***\n";
 $arr = array("ggg", "ddd", "aaa", "sss");
-$file_handle = popen("sort", "w");
+// popen("sort", "w") fails if variables_order="GPCS"
+// this is set in the default INI file
+// it doesn't seem to be changeable in the --INI-- section
+//	also, doing: ini_set('variables_order', ''); doesn't work!
+//
+// the only solution is to either put the absolute path here, or
+// remove variables_order= from PHP.ini (setting it in run-test's
+// default INI will fail too)
+// 
+// since we can't depend on PHP.ini being set a certain way, 
+// have to put the absolute path here.
+$file_handle = popen("/windows/system32/sort", "w");
 $newline = "\n";
 foreach($arr as $str) {
   fwrite($file_handle, (binary)$str);