cvs: php4 /ext/session mod_files.c mod_user.c session.c

yohgaki Tue Mar 5 19:05:39 2002 EDT Modified files: /php4/ext/session mod_files.c mod_user.c session.c Log: Remove TSRMLS_FETCH() and use TSRMLS_C/TSRMLS_D # Need a little more work for backword compatibility Index: php4/ext/session/mod_files.c diff -u php4/ext/session/mod_files.c:1.68 php4/ext/session/mod_files.c:1.69 --- php4/ext/session/mod_files.c:1.68 Thu Feb 28 03:26:39 2002 +++ php4/ext/session/mod_files.c Tue Mar 5 19:05:14 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mod_files.c,v 1.68 2002/02/28 08:26:39 sebastian Exp $ */ +/* $Id: mod_files.c,v 1.69 2002/03/06 00:05:14 yohgaki Exp $ */ #include "php.h" @@ -123,10 +123,9 @@ } } -static void ps_files_open(ps_files *data, const char *key) +static void ps_files_open(ps_files *data, const char *key TSRMLS_DC) { char buf[MAXPATHLEN]; - TSRMLS_FETCH(); if (data->fd < 0 || !data->lastkey || strcmp(key, data->lastkey)) { if (data->lastkey) { @@ -159,7 +158,7 @@ } } -static int ps_files_cleanup_dir(const char *dirname, int maxlifetime) +static int ps_files_cleanup_dir(const char *dirname, int maxlifetime TSRMLS_DC) { DIR *dir; char dentry[sizeof(struct dirent) + MAXPATHLEN]; @@ -169,7 +168,6 @@ time_t now; int nrdels = 0; size_t dirname_len; - TSRMLS_FETCH(); dir = opendir(dirname); if (!dir) { @@ -254,7 +252,7 @@ struct stat sbuf; PS_FILES_DATA; - ps_files_open(data, key); + ps_files_open(data, key TSRMLS_CC); if (data->fd < 0) return FAILURE; @@ -283,7 +281,7 @@ long n; PS_FILES_DATA; - ps_files_open(data, key); + ps_files_open(data, key TSRMLS_CC); if (data->fd < 0) return FAILURE; @@ -314,7 +312,6 @@ { char buf[MAXPATHLEN]; PS_FILES_DATA; - TSRMLS_FETCH(); if (!ps_files_path_create(buf, sizeof(buf), data, key)) return FAILURE; @@ -337,7 +334,7 @@ an external entity (i.e. find -ctime x | xargs rm) */ if (data->dirdepth == 0) - *nrdels = ps_files_cleanup_dir(data->basedir, maxlifetime); + *nrdels = ps_files_cleanup_dir(data->basedir, maxlifetime TSRMLS_CC); return SUCCESS; } Index: php4/ext/session/mod_user.c diff -u php4/ext/session/mod_user.c:1.21 php4/ext/session/mod_user.c:1.22 --- php4/ext/session/mod_user.c:1.21 Thu Feb 28 03:26:40 2002 +++ php4/ext/session/mod_user.c Tue Mar 5 19:05:20 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mod_user.c,v 1.21 2002/02/28 08:26:40 sebastian Exp $ */ +/* $Id: mod_user.c,v 1.22 2002/03/06 00:05:20 yohgaki Exp $ */ #include "php.h" #include "php_session.h" @@ -51,11 +51,10 @@ } -static zval *ps_call_handler(zval *func, int argc, zval **argv) +static zval *ps_call_handler(zval *func, int argc, zval **argv TSRMLS_DC) { int i; zval *retval = NULL; - TSRMLS_FETCH(); MAKE_STD_ZVAL(retval); if (call_user_function(EG(function_table), NULL, func, retval, @@ -96,7 +95,7 @@ SESS_ZVAL_STRING(save_path, args[0]); SESS_ZVAL_STRING(session_name, args[1]); - retval = ps_call_handler(PSF(open), 2, args); + retval = ps_call_handler(PSF(open), 2, args TSRMLS_CC); FINISH; } @@ -106,7 +105,7 @@ int i; STDVARS; - retval = ps_call_handler(PSF(close), 0, NULL); + retval = ps_call_handler(PSF(close), 0, NULL TSRMLS_CC); for (i = 0; i < 6; i++) zval_ptr_dtor(&mdata->names[i]); @@ -124,7 +123,7 @@ SESS_ZVAL_STRING(key, args[0]); - retval = ps_call_handler(PSF(read), 1, args); + retval = ps_call_handler(PSF(read), 1, args TSRMLS_CC); if (retval) { if (Z_TYPE_P(retval) == IS_STRING) { @@ -158,7 +157,7 @@ SESS_ZVAL_STRING(key, args[0]); - retval = ps_call_handler(PSF(destroy), 1, args); + retval = ps_call_handler(PSF(destroy), 1, args TSRMLS_CC); FINISH; } @@ -170,7 +169,7 @@ SESS_ZVAL_LONG(maxlifetime, args[0]); - retval = ps_call_handler(PSF(gc), 1, args); + retval = ps_call_handler(PSF(gc), 1, args TSRMLS_CC); FINISH; } Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.282 php4/ext/session/session.c:1.283 --- php4/ext/session/session.c:1.282 Tue Mar 5 18:37:00 2002 +++ php4/ext/session/session.c Tue Mar 5 19:05:21 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.282 2002/03/05 23:37:00 yohgaki Exp $ */ +/* $Id: session.c,v 1.283 2002/03/06 00:05:21 yohgaki Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -300,10 +300,7 @@ if (zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), name, namelen+1, (void **) state_var)==SUCCESS) { return SUCCESS; } - } else if (!PG(register_globals)) { - /* register_globals is disabled, but we don't have http_session_vars */ - return HASH_KEY_NON_EXISTANT; - } + } return zend_hash_find(&EG(symbol_table), name, namelen+1, (void **) state_var); } @@ -592,10 +589,10 @@ if (PS(mod_data)) { val = php_session_encode(&vallen TSRMLS_CC); if (val) { - ret = PS(mod)->write(&PS(mod_data), PS(id), val, vallen); + ret = PS(mod)->write(&PS(mod_data), PS(id), val, vallen TSRMLS_CC); efree(val); } else { - ret = PS(mod)->write(&PS(mod_data), PS(id), "", 0); + ret = PS(mod)->write(&PS(mod_data), PS(id), "", 0 TSRMLS_CC); } } @@ -608,7 +605,7 @@ if (PS(mod_data)) - PS(mod)->close(&PS(mod_data)); + PS(mod)->close(&PS(mod_data) TSRMLS_CC); } static char *month_names[] = { @@ -955,7 +952,7 @@ nrand = (int) (100.0*php_combined_lcg(TSRMLS_C)); if (nrand < PS(gc_probability)) { - PS(mod)->gc(&PS(mod_data), PS(gc_maxlifetime), &nrdels); + PS(mod)->gc(&PS(mod_data), PS(gc_maxlifetime), &nrdels TSRMLS_CC); #if 0 if (nrdels != -1) php_error(E_NOTICE, "purged %d expired session objects\n", nrdels); @@ -1049,18 +1046,22 @@ { zval **p_name; int ac = ZEND_NUM_ARGS(); - char *old; - - old = estrdup(PS(session_name)); + char *old = NULL; if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &p_name) == FAILURE) WRONG_PARAM_COUNT; if (ac == 1) { + if (PS(session_status) == php_session_active) { + php_error(E_NOTICE, "%s() cannot set session name once session is started.", + get_active_function_name(TSRMLS_C)); + RETURN_FALSE; + } convert_to_string_ex(p_name); zend_alter_ini_entry("session.name", sizeof("session.name"), Z_STRVAL_PP(p_name), Z_STRLEN_PP(p_name), PHP_INI_USER, PHP_INI_STAGE_RUNTIME); } - + + old = estrdup(PS(session_name)); RETVAL_STRING(old, 0); } /* }}} */ @@ -1468,7 +1469,7 @@ static void php_rshutdown_session_globals(TSRMLS_D) { if (PS(mod_data)) { - PS(mod)->close(&PS(mod_data)); + PS(mod)->close(&PS(mod_data) TSRMLS_CC); } if (PS(id)) { efree(PS(id));