Merge branch 'PHP-5.4'

laruence · laruence · commit 401230c7e181 · 2012-07-18T19:50:59.000+08:00
* PHP-5.4:
  Fix test (no charset outputed)
diff --git a/sapi/cgi/tests/apache_request_headers.phpt b/sapi/cgi/tests/apache_request_headers.phpt
@@ -31,7 +31,7 @@ echo "Done\n";
 ?>
 --EXPECTF--	
 X-Powered-By: PHP/%s
-Content-type: text/html; charset=UTF-8
+Content-type: text/%s
 
 Array
 (

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ echo "Done\n";`
`31`	`31`	`?>`
`32`	`32`	`--EXPECTF--`
`33`	`33`	`X-Powered-By: PHP/%s`
`34`		`-Content-type: text/html; charset=UTF-8`
	`34`	`+Content-type: text/%s`
`35`	`35`
`36`	`36`	`Array`
`37`	`37`	`(`