summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-12-17 12:58:12 +0800
committerXinchen Hui <laruence@php.net>2012-12-17 12:58:12 +0800
commitea5132866f2889c0a3331244271fb96214bcfe8f (patch)
treee84b9c5fb47decd65f7471e9ab8cccc975b2d8c4 /ext
parent67a7a6646684855630bf98fe34eb026f018bf554 (diff)
parent2f7f57a4071a2587698d0e18d89df16e532c5ec0 (diff)
downloadphp-git-ea5132866f2889c0a3331244271fb96214bcfe8f.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
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