summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@php.net>2012-12-13 16:15:06 -0800
committerRasmus Lerdorf <rasmus@php.net>2012-12-13 16:15:06 -0800
commit538d8338c03e7442acabd014e142893aa344de62 (patch)
tree0192c86b5fd415869166ec6c490b2780029cc4bb
parent6566ea61732a1ab42c1a57e60adc96788cb0feb2 (diff)
parenteecdb4c254bafe5fc53b1e06055482944cd3560f (diff)
downloadphp-git-538d8338c03e7442acabd014e142893aa344de62.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
-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 12310205aa..223fb35905 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: ) in %s on line 3
+Fatal error: session_start(): Failed to initialize storage module: user (path: %s) in %s on line 3