com php-src: Use distinguishable error messages.: ext/session/session.c
| From: | Anatol Belski | Date: | Tue, 17 Nov 2015 12:13:28 +0000 |
| Subject: | com php-src: Use distinguishable error messages.: ext/session/session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89925@lists.php.net to get a copy of this message | ||
Commit: 04d99b34339844c89d0e9eace7dd8793e3a1c6b6
Author: Yasuo Ohgaki <yohgaki@php.net> Fri, 13 Nov 2015 21:22:59 +0900
Committer: Anatol Belski <ab@php.net> Tue, 17 Nov 2015 13:13:28 +0100
Parents: 14d8216404de76bf691b2e6fb5eea1002ccc3aaf
Branches: PHP-7.0.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=04d99b34339844c89d0e9eace7dd8793e3a1c6b6
Log:
Use distinguishable error messages.
Changed paths:
M ext/session/session.c
Diff:
diff --git a/ext/session/session.c b/ext/session/session.c
index dd86518..5e4831c 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -2074,12 +2074,12 @@ static PHP_FUNCTION(session_regenerate_id)
PS(id) = PS(mod)->s_create_sid(&PS(mod_data));
if (!PS(id)) {
PS(session_status) = php_session_none;
- php_error_docref(NULL, E_RECOVERABLE_ERROR, "Failed to create session ID: %s (path:
%s)", PS(mod)->s_name, PS(save_path));
+ php_error_docref(NULL, E_RECOVERABLE_ERROR, "Failed to create new session ID: %s (path:
%s)", PS(mod)->s_name, PS(save_path));
RETURN_FALSE;
}
if (PS(mod)->s_open(&PS(mod_data), PS(save_path), PS(session_name)) == FAILURE) {
PS(session_status) = php_session_none;
- php_error_docref(NULL, E_RECOVERABLE_ERROR, "Failed to create session ID: %s (path:
%s)", PS(mod)->s_name, PS(save_path));
+ php_error_docref(NULL, E_RECOVERABLE_ERROR, "Failed to create(open) session ID: %s (path:
%s)", PS(mod)->s_name, PS(save_path));
RETURN_FALSE;
}
if (PS(use_strict_mode) && PS(mod)->s_validate_sid &&
@@ -2088,14 +2088,14 @@ static PHP_FUNCTION(session_regenerate_id)
PS(id) = PS(mod)->s_create_sid(&PS(mod_data));
if (!PS(id)) {
PS(session_status) = php_session_none;
- php_error_docref(NULL, E_RECOVERABLE_ERROR, "Failed to create session ID: %s (path:
%s)", PS(mod)->s_name, PS(save_path));
+ php_error_docref(NULL, E_RECOVERABLE_ERROR, "Failed to create session ID by collision: %s
(path: %s)", PS(mod)->s_name, PS(save_path));
RETURN_FALSE;
}
}
/* Read is required to make new session data at this point. */
if (PS(mod)->s_read(&PS(mod_data), PS(id), &data, PS(gc_maxlifetime)) == FAILURE) {
PS(session_status) = php_session_none;
- php_error_docref(NULL, E_RECOVERABLE_ERROR, "Failed to create session ID: %s (path:
%s)", PS(mod)->s_name, PS(save_path));
+ php_error_docref(NULL, E_RECOVERABLE_ERROR, "Failed to create(read) session ID: %s (path:
%s)", PS(mod)->s_name, PS(save_path));
RETURN_FALSE;
}
if (data) {