mirror of
https://github.com/php/php-src.git
synced 2026-03-27 01:32:22 +01:00
- Nuke ending periods from error messages
This commit is contained in:
@@ -168,7 +168,7 @@ static PHP_GINIT_FUNCTION(ps);
|
||||
|
||||
#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 @@ static char *php_session_encode(int *newlen TSRMLS_DC)
|
||||
|
||||
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 char *php_session_encode(int *newlen TSRMLS_DC)
|
||||
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 @@ static void php_session_initialize(TSRMLS_D)
|
||||
}
|
||||
|
||||
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 @@ static int migrate_global(HashTable *ht, HashPosition *pos TSRMLS_DC)
|
||||
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 @@ static void php_session_save_current_state(TSRMLS_D)
|
||||
}
|
||||
|
||||
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");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user