summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2013-11-26 21:44:54 +0400
committerDmitry Stogov <dmitry@zend.com>2013-11-26 21:44:54 +0400
commit2381b817aa850f08e67e338ec4a430b01d935e88 (patch)
treee7376ca8be8adcd3cf02b5fd6b4c4ff3a4b16549
parentd79dd9cc1cab03aecf6d3f6ec243bc15aa353234 (diff)
parentff20a9019d2d5e226dfa03b24285c77a623ac35c (diff)
downloadphp-git-2381b817aa850f08e67e338ec4a430b01d935e88.tar.gz
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src: Fixed a wrong test
-rw-r--r--sapi/cli/tests/php_cli_server_019.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/cli/tests/php_cli_server_019.phpt b/sapi/cli/tests/php_cli_server_019.phpt
index cdad01ed64..2b983e5c0a 100644
--- 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"]=>