diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2015-11-13 21:27:13 +0900 |
|---|---|---|
| committer | Yasuo Ohgaki <yohgaki@php.net> | 2015-11-13 21:27:13 +0900 |
| commit | cbe906226aeafb1d3e4b47744ceaff47ab130be2 (patch) | |
| tree | e42fdeca5f9793d71ab4155f692a8edc8a47ad7d | |
| parent | 6d83a8c2a7dc254eed0bc7fc5bd06c1cc1568ed1 (diff) | |
| parent | a03786f7730e99e86113b826087e2271a2b001fc (diff) | |
| download | php-git-cbe906226aeafb1d3e4b47744ceaff47ab130be2.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Use distinguishable error messages.
| -rw-r--r-- | ext/session/session.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index dd8651883d..5e4831c6be 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) { |