CVS update: php4/ext/session
| From: | sas | Date: | Mon, 07 Jun 1999 16:43:24 +0000 |
| Subject: | CVS update: php4/ext/session | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-1374@lists.php.net to get a copy of this message | ||
Date: Monday June 7, 1999 @ 12:43
Author: sas
Update of /repository/php4/ext/session
In directory php:/tmp/cvs-serv25157
Modified Files:
mod_files.c mod_files.h php_session.h session.c
Log Message:
- some cleanups
- add gc logic
- add session_destroy()
Index: php4/ext/session/mod_files.c
diff -u php4/ext/session/mod_files.c:1.2 php4/ext/session/mod_files.c:1.3
--- php4/ext/session/mod_files.c:1.2 Sun Jun 6 15:53:59 1999
+++ php4/ext/session/mod_files.c Mon Jun 7 12:43:24 1999
@@ -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;
Index: php4/ext/session/mod_files.h
diff -u php4/ext/session/mod_files.h:1.1 php4/ext/session/mod_files.h:1.2
--- php4/ext/session/mod_files.h:1.1 Sat Jun 5 15:52:58 1999
+++ php4/ext/session/mod_files.h Mon Jun 7 12:43:24 1999
@@ -33,4 +33,6 @@
extern ps_module ps_mod_files;
#define ps_files_ptr &ps_mod_files
+PS_FUNCS(files);
+
#endif
Index: php4/ext/session/php_session.h
diff -u php4/ext/session/php_session.h:1.2 php4/ext/session/php_session.h:1.3
--- php4/ext/session/php_session.h:1.2 Sun Jun 6 11:18:51 1999
+++ php4/ext/session/php_session.h Mon Jun 7 12:43:24 1999
@@ -40,7 +40,7 @@
#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 @@
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_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
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.14 php4/ext/session/session.c:1.15
--- php4/ext/session/session.c:1.14 Sun Jun 6 15:53:59 1999
+++ php4/ext/session/session.c Mon Jun 7 12:43:24 1999
@@ -69,6 +69,7 @@
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_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_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 @@
} 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 @@
{
pval **ppid;
int send_cookie = 1;
+ int nrand;
ELS_FETCH();
if(!PS(id) &&
@@ -303,6 +307,23 @@
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 @@
}
/* }}} */
+/* {{{ 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 @@
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 @@
if(PS(nr_open_sessions) > 0) {
_php_session_save_current_state(PSLS_C);
+ PS(nr_open_sessions)--;
}
php_rshutdown_globals(PSLS_C);
return SUCCESS;