diff options
| -rw-r--r-- | ext/session/mod_files.c | 3 | ||||
| -rw-r--r-- | ext/session/mod_files.h | 2 | ||||
| -rw-r--r-- | ext/session/php_session.h | 7 | ||||
| -rw-r--r-- | ext/session/session.c | 42 |
4 files changed, 46 insertions, 8 deletions
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index 6d998827c1..bc775cfc95 100644 --- a/ext/session/mod_files.c +++ b/ext/session/mod_files.c @@ -34,7 +34,8 @@ #include "php.h" #include "php_session.h" -#include "../standard/flock_compat.h" +#include "mod_files.h" +#include "ext/standard/flock_compat.h" typedef struct { int fd; diff --git a/ext/session/mod_files.h b/ext/session/mod_files.h index b3b25f06cb..9f40704a42 100644 --- a/ext/session/mod_files.h +++ b/ext/session/mod_files.h @@ -33,4 +33,6 @@ extern ps_module ps_mod_files; #define ps_files_ptr &ps_mod_files +PS_FUNCS(files); + #endif diff --git a/ext/session/php_session.h b/ext/session/php_session.h index 7441547828..0637b29107 100644 --- a/ext/session/php_session.h +++ b/ext/session/php_session.h @@ -40,7 +40,7 @@ typedef enum { #define PS_READ_ARGS void **mod_data, const char *key, char **val, int *vallen #define PS_WRITE_ARGS void **mod_data, const char *key, const char *val, const int vallen #define PS_DELETE_ARGS void **mod_data, const char *key -#define PS_GC_ARGS void **mod_data +#define PS_GC_ARGS void **mod_data, int maxlifetime typedef struct ps_module_struct { char *name; @@ -82,6 +82,8 @@ typedef struct { void *mod_data; HashTable vars; int nr_open_sessions; + int gc_probability; + int gc_maxlifetime; } php_ps_globals; extern zend_module_entry session_module_entry; @@ -96,8 +98,7 @@ PHP_FUNCTION(session_register); PHP_FUNCTION(session_unregister); PHP_FUNCTION(session_encode); PHP_FUNCTION(session_start); - -PS_FUNCS(files); +PHP_FUNCTION(session_destroy); #ifdef ZTS #define PSLS_D php_ps_globals *ps_globals diff --git a/ext/session/session.c b/ext/session/session.c index 3895c26b4e..1bfa91d746 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -69,6 +69,7 @@ function_entry session_functions[] = { PHP_FE(session_unregister, NULL) PHP_FE(session_encode, NULL) PHP_FE(session_start, NULL) + PHP_FE(session_destroy, NULL) {0} }; @@ -77,6 +78,8 @@ PHP_INI_BEGIN() PHP_INI_ENTRY("session_name", "PHPSESSID", PHP_INI_ALL, NULL) PHP_INI_ENTRY("session_module_name", "files", PHP_INI_ALL, NULL) PHP_INI_ENTRY("session_auto_start", "0", PHP_INI_ALL, NULL) + PHP_INI_ENTRY("session_gc_probability", "1", PHP_INI_ALL, NULL) + PHP_INI_ENTRY("session_gc_maxlifetime", "1440", PHP_INI_ALL, NULL) PHP_INI_END() @@ -85,6 +88,7 @@ static int php_rinit_session(INIT_FUNC_ARGS); static int php_mshutdown_session(SHUTDOWN_FUNC_ARGS); static int php_rshutdown_session(SHUTDOWN_FUNC_ARGS); static void php_info_isapi(ZEND_MODULE_INFO_FUNC_ARGS); +static void php_rshutdown_globals(PSLS_D); zend_module_entry session_module_entry = { "session", @@ -175,17 +179,16 @@ static void _php_session_decode(char *val, int vallen PSLS_DC) } else has_value = 1; - name = estrndup(p, q - p); namelen = q - p; + name = estrndup(p, namelen); q++; if(has_value) { current = (pval *) ecalloc(sizeof(pval), 1); - if(php3api_var_unserialize(¤t, &q, val + vallen)) { - zend_hash_update(&EG(symbol_table), name, strlen(name) + 1, + if(php3api_var_unserialize(¤t, &q, endptr)) { + zend_hash_update(&EG(symbol_table), name, namelen + 1, ¤t, sizeof(current), NULL); - PS_ADD_VAR(name); } else { efree(current); } @@ -283,6 +286,7 @@ static void _php_session_start(PSLS_D) { pval **ppid; int send_cookie = 1; + int nrand; ELS_FETCH(); if(!PS(id) && @@ -303,6 +307,23 @@ static void _php_session_start(PSLS_D) PS(nr_open_sessions)++; _php_session_initialize(PSLS_C); + + if(PS(mod_data) && PS(gc_probability) > 0) { + srand(time(NULL)); + nrand = (100.0*rand()/RAND_MAX); + if(nrand >= PS(gc_probability)) + PS(mod)->gc(&PS(mod_data), PS(gc_maxlifetime)); + } +} + +static void _php_session_destroy(PSLS_D) +{ + if(PS(nr_open_sessions) == 0) + return; + + PS(mod)->delete(&PS(mod_data), &PS(id)); + php_rshutdown_globals(PSLS_C); + PS(nr_open_sessions)--; } /* {{{ proto string session_name([string newname]) @@ -492,6 +513,16 @@ PHP_FUNCTION(session_start) } /* }}} */ +/* {{{ proto session_destroy() + Destroy the current session and all data associated with it */ +PHP_FUNCTION(session_destroy) +{ + PSLS_FETCH(); + + _php_session_destroy(PSLS_C); +} +/* }}} */ + void php_rinit_globals(PSLS_D) { PS(mod) = _php_find_ps_module(INI_STR("session_module_name") PSLS_CC); @@ -499,6 +530,8 @@ void php_rinit_globals(PSLS_D) zend_hash_init(&PS(vars), 0, NULL, NULL, 0); PS(save_path) = estrdup(INI_STR("session_save_path")); PS(session_name) = estrdup(INI_STR("session_name")); + PS(gc_probability) = INI_INT("gc_probability"); + PS(gc_maxlifetime) = INI_INT("gc_maxlifetime"); PS(id) = NULL; PS(nr_open_sessions) = 0; PS(mod_data) = NULL; @@ -535,6 +568,7 @@ int php_rshutdown_session(SHUTDOWN_FUNC_ARGS) if(PS(nr_open_sessions) > 0) { _php_session_save_current_state(PSLS_C); + PS(nr_open_sessions)--; } php_rshutdown_globals(PSLS_C); return SUCCESS; |