Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed a wrong test

Author: Julien Pauli

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"]=>