Merge branch 'PHP-5.4'

Author: laruence

sapi/cgi/tests/apache_request_headers.phpt

@@ -17,12 +17,12 @@ $file = dirname(__FILE__)."/012.test.php";
 
 file_put_contents($file, '<?php print_r(apache_request_headers()); ?>');
 
-passthru("$php $file");
+passthru("$php -n $file");
 
 $names = array('HTTP_X_TEST', 'HTTP_X__TEST', 'HTTP_X_');
 foreach ($names as $name) {
 	putenv($name."=".str_repeat("A", 256));
-	passthru("$php -q $file");
+	passthru("$php -n -q $file");
 	putenv($name);
 }
 unlink($file);