jani Tue Aug 5 22:52:05 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/session session.c
Log:
- Nuke ending periods from error messages
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.417.2.8.2.40.2.12&r2=1.417.2.8.2.40.2.13&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.417.2.8.2.40.2.12
php-src/ext/session/session.c:1.417.2.8.2.40.2.13
--- php-src/ext/session/session.c:1.417.2.8.2.40.2.12 Mon Aug 4 06:21:55 2008
+++ php-src/ext/session/session.c Tue Aug 5 22:52:05 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.417.2.8.2.40.2.12 2008/08/04 06:21:55 kalle Exp $ */
+/* $Id: session.c,v 1.417.2.8.2.40.2.13 2008/08/05 22:52:05 jani Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -168,7 +168,7 @@
#define SESSION_CHECK_ACTIVE_STATE \
if (PS(session_status) == php_session_active) { \
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "A session is
active. You cannot change the session module's ini settings at this time."); \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "A session is
active. You cannot change the session module's ini settings at this time"); \
return FAILURE; \
} \
@@ -714,13 +714,13 @@
IF_SESSION_VARS() {
if (!PS(serializer)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown
session.serialize_handler. Failed to encode session object.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown
session.serialize_handler. Failed to encode session object");
ret = NULL;
}
else if (PS(serializer)->encode(&ret, newlen TSRMLS_CC) ==
FAILURE)
ret = NULL;
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot encode
non-existent session.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot encode
non-existent session");
}
return ret;
@@ -729,12 +729,12 @@
static void php_session_decode(const char *val, int vallen TSRMLS_DC)
{
if (!PS(serializer)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown
session.serialize_handler. Failed to decode session object.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown
session.serialize_handler. Failed to decode session object");
return;
}
if (PS(serializer)->decode(val, vallen TSRMLS_CC) == FAILURE) {
php_session_destroy(TSRMLS_C);
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to decode
session object. Session has been destroyed.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to decode
session object. Session has been destroyed");
}
}
@@ -895,7 +895,7 @@
}
if (!PS(mod)) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "No storage module
chosen - failed to initialize session.");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "No storage module
chosen - failed to initialize session");
return;
}
@@ -957,7 +957,7 @@
case HASH_KEY_IS_LONG:
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The session
bug compatibility code will not "
"try to locate the global variable $%lu
due to its "
- "numeric nature.", num_key);
+ "numeric nature", num_key);
break;
}
@@ -987,7 +987,7 @@
}
if (do_warn && PS(bug_compat_warn)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Your script possibly relies on a session side-effect which existed until PHP
4.2.3. Please be advised that the session extension does not consider global
variables as a source of data, unless register_globals is enabled. You can
disable this functionality and this warning by setting session.bug_compat_42 or
session.bug_compat_warn to off, respectively.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Your script possibly relies on a session side-effect which existed until PHP
4.2.3. Please be advised that the session extension does not consider global
variables as a source of data, unless register_globals is enabled. You can
disable this functionality and this warning by setting session.bug_compat_42 or
session.bug_compat_warn to off, respectively");
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
