arpad Wed, 14 Sep 2011 15:30:30 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=316754
Log:
fix default session handler error message
Changed paths:
U php/php-src/branches/PHP_5_4/ext/session/mod_user_class.c
U
php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_014.phpt
U php/php-src/trunk/ext/session/mod_user_class.c
U
php/php-src/trunk/ext/session/tests/session_set_save_handler_class_014.phpt
Modified: php/php-src/branches/PHP_5_4/ext/session/mod_user_class.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/session/mod_user_class.c 2011-09-14
15:23:12 UTC (rev 316753)
+++ php/php-src/branches/PHP_5_4/ext/session/mod_user_class.c 2011-09-14
15:30:30 UTC (rev 316754)
@@ -23,7 +23,7 @@
#define PS_SANITY_CHECK \
if (PS(default_mod) == NULL) { \
- php_error_docref(NULL TSRMLS_CC, E_CORE_ERROR, "Called default
SessionHandler but session.save_handler is user"); \
+ php_error_docref(NULL TSRMLS_CC, E_CORE_ERROR, "Cannot call
default session handler"); \
RETURN_FALSE; \
}
Modified:
php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_014.phpt
===================================================================
---
php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_014.phpt
2011-09-14 15:23:12 UTC (rev 316753)
+++
php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_014.phpt
2011-09-14 15:30:30 UTC (rev 316754)
@@ -27,6 +27,6 @@
--EXPECTF--
*** Testing session_set_save_handler() : calling default handler when
save_handler=user ***
-Fatal error: SessionHandler::open(): Called default SessionHandler but
session.save_handler is user in Unknown on line %d
+Fatal error: SessionHandler::open(): Cannot call default session handler in %s
on line %d
-Fatal error: Unknown: Called default SessionHandler but session.save_handler
is user in Unknown on line %d
+Fatal error: Unknown: Cannot call default session handler in %s on line %d
Modified: php/php-src/trunk/ext/session/mod_user_class.c
===================================================================
--- php/php-src/trunk/ext/session/mod_user_class.c 2011-09-14 15:23:12 UTC
(rev 316753)
+++ php/php-src/trunk/ext/session/mod_user_class.c 2011-09-14 15:30:30 UTC
(rev 316754)
@@ -23,7 +23,7 @@
#define PS_SANITY_CHECK \
if (PS(default_mod) == NULL) { \
- php_error_docref(NULL TSRMLS_CC, E_CORE_ERROR, "Called default
SessionHandler but session.save_handler is user"); \
+ php_error_docref(NULL TSRMLS_CC, E_CORE_ERROR, "Cannot call
default session handler"); \
RETURN_FALSE; \
}
Modified:
php/php-src/trunk/ext/session/tests/session_set_save_handler_class_014.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_set_save_handler_class_014.phpt
2011-09-14 15:23:12 UTC (rev 316753)
+++ php/php-src/trunk/ext/session/tests/session_set_save_handler_class_014.phpt
2011-09-14 15:30:30 UTC (rev 316754)
@@ -27,6 +27,6 @@
--EXPECTF--
*** Testing session_set_save_handler() : calling default handler when
save_handler=user ***
-Fatal error: SessionHandler::open(): Called default SessionHandler but
session.save_handler is user in Unknown on line %d
+Fatal error: SessionHandler::open(): Cannot call default session handler in %s
on line %d
-Fatal error: Unknown: Called default SessionHandler but session.save_handler
is user in Unknown on line %d
+Fatal error: Unknown: Cannot call default session handler in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
