Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5: Fixed a wrong test
13 years ago · aa33da6a51
1 changed files with 1 additions and 1 deletions
--- a/sapi/cli/tests/php_cli_server_019.phpt
+++ b/sapi/cli/tests/php_cli_server_019.phpt
@ -60,7 +60,7 @@ array(2) {
 }
 array(3) {
  ["X-Powered-By"]=>
-  string(13) "P%s"
+  string(%d) "P%s"
  ["Bar-Foo"]=>
  string(3) "Foo"
  ["Content-type"]=>