cvs: php4 /ext/session php_session.h session.c

zeev Fri Aug 31 15:26:13 2001 EDT Modified files: /php4/ext/session php_session.h session.c Log: Cleanup and clarify Index: php4/ext/session/php_session.h diff -u php4/ext/session/php_session.h:1.57 php4/ext/session/php_session.h:1.58 --- php4/ext/session/php_session.h:1.57 Sun Aug 26 20:23:54 2001 +++ php4/ext/session/php_session.h Fri Aug 31 15:26:12 2001 @@ -88,7 +88,6 @@ const struct ps_serializer_struct *serializer; zval *http_session_vars; zend_bool auto_start; - zend_bool define_sid; zend_bool use_cookies; zend_bool use_trans_sid; zend_bool output_handler_registered; Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.247 php4/ext/session/session.c:1.248 --- php4/ext/session/session.c:1.247 Fri Aug 31 15:22:08 2001 +++ php4/ext/session/session.c Fri Aug 31 15:26:12 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.247 2001/08/31 19:22:08 zeev Exp $ */ +/* $Id: session.c,v 1.248 2001/08/31 19:26:12 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -809,6 +809,7 @@ int module_number = PS(module_number); int nrand; int lensess; + int register_trans_sid_handler = PS(use_trans_sid); if (PS(session_status) != php_session_none) return; @@ -828,7 +829,7 @@ zend_hash_find(Z_ARRVAL_PP(data), PS(session_name), lensess + 1, (void **) &ppid) == SUCCESS) { PPID2SID; - PS(define_sid) = 0; + register_trans_sid_handler = 0; send_cookie = 0; } @@ -883,14 +884,14 @@ efree(PS(id)); PS(id) = NULL; send_cookie = 1; - PS(define_sid) = 1; + register_trans_sid_handler = 1; } if (!PS(id)) PS(id) = _php_create_id(NULL TSRMLS_CC); if (!PS(use_cookies) && send_cookie) { - PS(define_sid) = 1; + register_trans_sid_handler = 1; send_cookie = 0; } @@ -899,7 +900,7 @@ } - if (PS(define_sid)) { + if (register_trans_sid_handler) { smart_str var = {0}; smart_str_appends(&var, PS(session_name)); @@ -912,7 +913,7 @@ } PS(session_status) = php_session_active; - if (PS(define_sid) && PS(use_trans_sid)) { + if (register_trans_sid_handler) { php_session_start_output_handler(4096 TSRMLS_CC); } @@ -1312,12 +1313,6 @@ } /* }}} */ -void session_adapt_url(const char *url, size_t urllen, char **new, size_t *newlen TSRMLS_DC) -{ - if (PS(define_sid) && (PS(session_status) == php_session_active)) { - *new = url_adapt_single_url(url, urllen, PS(session_name), PS(id), newlen TSRMLS_CC); - } -} /* {{{ proto void session_unset(void) Unset all registered variables */ @@ -1346,7 +1341,6 @@ static void php_rinit_session_globals(TSRMLS_D) { zend_hash_init(&PS(vars), 0, NULL, NULL, 0); - PS(define_sid) = 0; PS(id) = NULL; PS(session_status) = php_session_none; PS(mod_data) = NULL;