diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2016-11-15 12:10:20 +0900 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-11-16 05:08:29 +0000 |
| commit | d990c54c83e7c06c142344200f1e12cdfa5c8ae7 (patch) | |
| tree | 602464fb3e453a2058e5c8cddaa157711682878a | |
| parent | 3b45716e40b8239b045a6ee6b74f913e9c1eb913 (diff) | |
| download | php-git-d990c54c83e7c06c142344200f1e12cdfa5c8ae7.tar.gz | |
Improve error message
| -rw-r--r-- | ext/session/mod_user.c | 2 | ||||
| -rw-r--r-- | ext/session/tests/bug60634.phpt | 2 | ||||
| -rw-r--r-- | ext/session/tests/bug60634_error_3.phpt | 2 | ||||
| -rw-r--r-- | ext/session/tests/bug60634_error_4.phpt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ext/session/mod_user.c b/ext/session/mod_user.c index 9755f0d5c4..992b0edd37 100644 --- a/ext/session/mod_user.c +++ b/ext/session/mod_user.c @@ -33,7 +33,7 @@ static void ps_call_handler(zval *func, int argc, zval *argv, zval *retval) if (PS(in_save_handler)) { PS(in_save_handler) = 0; ZVAL_UNDEF(retval); - php_error_docref(NULL, E_WARNING, "Cannot call save handler function recursive manner"); + php_error_docref(NULL, E_WARNING, "Cannot call session save handler in a recursive manner"); return; } PS(in_save_handler) = 1; diff --git a/ext/session/tests/bug60634.phpt b/ext/session/tests/bug60634.phpt index 34786406cb..a72ef07e90 100644 --- a/ext/session/tests/bug60634.phpt +++ b/ext/session/tests/bug60634.phpt @@ -52,7 +52,7 @@ echo "um, hi\n"; --EXPECTF-- write: goodbye cruel world -Warning: Unknown: Cannot call save handler function recursive manner in Unknown on line 0 +Warning: Unknown: Cannot call session save handler in a recursive manner in Unknown on line 0 Warning: Unknown: Failed to write session data using user defined save handler. (session.save_path: ) in Unknown on line 0 close: goodbye cruel world diff --git a/ext/session/tests/bug60634_error_3.phpt b/ext/session/tests/bug60634_error_3.phpt index b38899b8c1..776a7afea6 100644 --- a/ext/session/tests/bug60634_error_3.phpt +++ b/ext/session/tests/bug60634_error_3.phpt @@ -49,4 +49,4 @@ Stack trace: #1 {main} thrown in %s on line %d -Warning: Unknown: Cannot call save handler function recursive manner in Unknown on line 0 +Warning: Unknown: Cannot call session save handler in a recursive manner in Unknown on line 0 diff --git a/ext/session/tests/bug60634_error_4.phpt b/ext/session/tests/bug60634_error_4.phpt index 3ac6247974..0fd7db3ada 100644 --- a/ext/session/tests/bug60634_error_4.phpt +++ b/ext/session/tests/bug60634_error_4.phpt @@ -49,4 +49,4 @@ Stack trace: #1 {main} thrown in %s on line %d -Warning: Unknown: Cannot call save handler function recursive manner in Unknown on line 0 +Warning: Unknown: Cannot call session save handler in a recursive manner in Unknown on line 0 |