Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #62147 test bug - popen_pclose_basic-win32
This commit is contained in:
Anatoliy Belsky 2012-05-25 10:05:23 +02:00
commit e2daa69b62

View File

@ -39,7 +39,10 @@ $arr = array("ggg", "ddd", "aaa", "sss");
//
// 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");
$sysroot = exec('echo %SYSTEMROOT%');
$file_handle = popen("$sysroot/system32/sort", "w");
$newline = "\n";
foreach($arr as $str) {
fwrite($file_handle, (binary)$str);