Merge branch 'PHP-5.5'

dsp · dsp · commit ced5f41a9a02 · 2013-03-07T23:20:35.000+01:00
* PHP-5.5: Fix for https://bugs.php.net/bug.php?id=62649
diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php
@@ -443,7 +443,7 @@ function make_phar_dot_phar($dist_dir)
 	$phar->setStub(implode('', $stub));
 
 	echo "Creating phar.phar.bat\n";
-	file_put_contents($dist_dir . '/phar.phar.bat', "%~dp0php.exe %~dp0pharcommand.phar %*\r\n");
+	file_put_contents($dist_dir . '/phar.phar.bat', "\"%~dp0php.exe\" \"%~dp0pharcommand.phar\" %*\r\n");
 }
 
 if (!is_dir($test_dir)) {

Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,7 @@ function make_phar_dot_phar($dist_dir)`
`443`	`443`	`$phar->setStub(implode('', $stub));`
`444`	`444`
`445`	`445`	`echo "Creating phar.phar.bat\n";`
`446`		`- file_put_contents($dist_dir . '/phar.phar.bat', "%~dp0php.exe %~dp0pharcommand.phar %*\r\n");`
	`446`	`+ file_put_contents($dist_dir . '/phar.phar.bat', "\"%~dp0php.exe\" \"%~dp0pharcommand.phar\" %*\r\n");`
`447`	`447`	`}`
`448`	`448`
`449`	`449`	`if (!is_dir($test_dir)) {`