summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-12-17 12:57:37 +0800
committerXinchen Hui <laruence@php.net>2012-12-17 12:57:37 +0800
commit2f7f57a4071a2587698d0e18d89df16e532c5ec0 (patch)
treed7d9ea4647701d5d2b51a237f3ee7bfc586ccb95 /ext
parent36a5eca89ca6bdf0f6351f40bbcb893251887116 (diff)
parentd2cc09704951d8746d06decf95ea981426b8278b (diff)
downloadphp-git-2f7f57a4071a2587698d0e18d89df16e532c5ec0.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
Diffstat (limited to 'ext')
-rw-r--r--ext/session/tests/bug60860.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/session/tests/bug60860.phpt b/ext/session/tests/bug60860.phpt
index 223fb35905..83185862f0 100644
--- a/ext/session/tests/bug60860.phpt
+++ b/ext/session/tests/bug60860.phpt
@@ -14,4 +14,4 @@ echo "ok\n";
--EXPECTF--
Warning: session_start(): user session functions not defined in %s on line 3
-Fatal error: session_start(): Failed to initialize storage module: user (path: %s) in %s on line 3
+Fatal error: session_start(): Failed to initialize storage module: user (path:%s) in %s on line 3