com php-src: Add PHPAPI php_session_flush and php_ses sion_destroy: ext/session/php_session.h ext/session /session.c

Commit: e10425fe8be2b900af778c85ed823a31d96f8d24 Author: dreamszhu <dreamsxin@qq.com> Sun, 1 Jan 2017 07:30:22 +0800 Parents: e2a159fe01b4b4e09569836f409c215ff4546239 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e10425fe8be2b900af778c85ed823a31d96f8d24 Log: Add PHPAPI php_session_flush and php_session_destroy Changed paths: M ext/session/php_session.h M ext/session/session.c Diff: diff --git a/ext/session/php_session.h b/ext/session/php_session.h index abe4e44..d46e794 100644 --- a/ext/session/php_session.h +++ b/ext/session/php_session.h @@ -255,6 +255,7 @@ PHPAPI int php_session_update_timestamp(PS_UPDATE_TIMESTAMP_ARGS); PHPAPI void session_adapt_url(const char *, size_t, char **, size_t *); +PHPAPI int php_session_destroy(void); PHPAPI void php_add_session_var(zend_string *name); PHPAPI zval *php_set_session_var(zend_string *name, zval *state_val, php_unserialize_data_t *var_hash); PHPAPI zval *php_get_session_var(zend_string *name); @@ -267,6 +268,7 @@ PHPAPI int php_session_register_serializer(const char *name, PHPAPI void php_session_set_id(char *id); PHPAPI int php_session_start(void); +PHPAPI int php_session_flush(int write); PHPAPI ps_module *_php_find_ps_module(char *name); PHPAPI const ps_serializer *_php_find_ps_serializer(char *name); diff --git a/ext/session/session.c b/ext/session/session.c index 8784012..49a0315 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -151,7 +151,7 @@ static inline void php_rshutdown_session_globals(void) /* {{{ */ } /* }}} */ -static int php_session_destroy(void) /* {{{ */ +PHPAPI int php_session_destroy(void) /* {{{ */ { int retval = SUCCESS; @@ -1606,7 +1606,7 @@ PHPAPI int php_session_start(void) /* {{{ */ } /* }}} */ -static int php_session_flush(int write) /* {{{ */ +PHPAPI int php_session_flush(int write) /* {{{ */ { if (PS(session_status) == php_session_active) { php_session_save_current_state(write); @@ -1671,7 +1671,7 @@ static PHP_FUNCTION(session_set_cookie_params) return; } - + if (PS(session_status) == php_session_active) { php_error_docref(NULL, E_WARNING, "Cannot change session cookie parameters when session is active"); RETURN_FALSE;