Improve error message

diff --git a/ext/session/mod_user.c b/ext/session/mod_user.c
index 9755f0d5c498f66b3b86f392456f33d4ba330f81..992b0edd371771882286416a9fef4b8fb083ede7 100644 (file)
--- 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 34786406cb1544f1598bccea74b9d89565b8880b..a72ef07e904a530c5dbd4b7615a01fb8d3b555be 100644 (file)
--- 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 b38899b8c12d4113a747c9a6881b5f4621c9984b..776a7afea69d63bcd93fbafeb2f5c1f06901ab8d 100644 (file)
--- 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 3ac624797475542510bf505995ab32de694c6154..0fd7db3ada9c5988a1e2acda97b2fbaa5626dff6 100644 (file)
--- 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