diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/session/mod_user_class.c | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/session/mod_user_class.c')
| -rw-r--r-- | ext/session/mod_user_class.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/session/mod_user_class.c b/ext/session/mod_user_class.c index 0c8fb2c701..282137386e 100644 --- a/ext/session/mod_user_class.c +++ b/ext/session/mod_user_class.c @@ -25,14 +25,14 @@ if (PS(default_mod) == NULL) { \ php_error_docref(NULL, E_CORE_ERROR, "Cannot call default session handler"); \ RETURN_FALSE; \ - } + } #define PS_SANITY_CHECK_IS_OPEN \ PS_SANITY_CHECK; \ if (!PS(mod_user_is_open)) { \ php_error_docref(NULL, E_WARNING, "Parent session handler is not open"); \ RETURN_FALSE; \ - } + } /* {{{ proto bool SessionHandler::open(string save_path, string session_name) Wraps the old open handler */ @@ -61,7 +61,7 @@ PHP_METHOD(SessionHandler, close) // don't return on failure, since not closing the default handler // could result in memory leaks or other nasties zend_parse_parameters_none(); - + PS(mod_user_is_open) = 0; RETVAL_BOOL(SUCCESS == PS(default_mod)->s_close(&PS(mod_data))); } @@ -116,7 +116,7 @@ PHP_METHOD(SessionHandler, destroy) if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &key) == FAILURE) { return; } - + RETURN_BOOL(SUCCESS == PS(default_mod)->s_destroy(&PS(mod_data), key)); } /* }}} */ @@ -133,7 +133,7 @@ PHP_METHOD(SessionHandler, gc) if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &maxlifetime) == FAILURE) { return; } - + RETURN_BOOL(SUCCESS == PS(default_mod)->s_gc(&PS(mod_data), maxlifetime, &nrdels)); } /* }}} */ |