com php-src: Make sure closing save handler.: ext/session/session.c
| From: | Yasuo Ohgaki | Date: | Sun, 06 Sep 2015 19:55:08 +0000 |
| Subject: | com php-src: Make sure closing save handler.: ext/session/session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88937@lists.php.net to get a copy of this message | ||
Commit: aa352a34fd1077995ec159ba30a6cf62c70e64c7
Author: Yasuo Ohgaki <yohgaki@php.net> Mon, 7 Sep 2015 04:45:20 +0900
Parents: f34b858ed018d4c33bc0c3f03acc0bf143d35534
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=aa352a34fd1077995ec159ba30a6cf62c70e64c7
Log:
Make sure closing save handler.
Changed paths:
M ext/session/session.c
Diff:
diff --git a/ext/session/session.c b/ext/session/session.c
index 8c60463..be86dca 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -2052,13 +2052,14 @@ static PHP_FUNCTION(session_regenerate_id)
} else {
ret = PS(mod)->s_write(&PS(mod_data), PS(id), ZSTR_EMPTY_ALLOC(), PS(gc_maxlifetime));
}
- PS(mod)->s_close(&PS(mod_data));
if (ret == FAILURE) {
+ PS(mod)->s_close(&PS(mod_data));
PS(session_status) = php_session_none;
php_error_docref(NULL, E_WARNING, "Session write failed. ID: %s (path: %s)",
PS(mod)->s_name, PS(save_path));
RETURN_FALSE;
}
}
+ PS(mod)->s_close(&PS(mod_data));
/* New session data */
if (PS(session_vars)) {