cvs: php4 /ext/session session.c /ext/standard url_scanner.c url_scanner.h url_scanner_ex.c url_scanner_ex.h url_scanner_ex.re

zeev Sun Aug 26 07:49:43 2001 EDT Modified files: /php4/ext/session session.c /php4/ext/standard url_scanner.c url_scanner.h url_scanner_ex.c url_scanner_ex.h url_scanner_ex.re Log: Fix my session updates. trans_sid handling will no longer slow down performance unless a session is actually in use. Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.242 php4/ext/session/session.c:1.243 --- php4/ext/session/session.c:1.242 Sun Aug 26 07:14:35 2001 +++ php4/ext/session/session.c Sun Aug 26 07:49:43 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.242 2001/08/26 11:14:35 zeev Exp $ */ +/* $Id: session.c,v 1.243 2001/08/26 11:49:43 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -83,6 +83,7 @@ static ps_module *_php_find_ps_module(char *name TSRMLS_DC); static const ps_serializer *_php_find_ps_serializer(char *name TSRMLS_DC); + static int session_adapt_uris(const char *src, size_t srclen, char **new, size_t *newlen, zend_bool do_flush TSRMLS_DC) { if (PS(define_sid) && (PS(session_status) == php_session_active)) { @@ -94,6 +95,7 @@ } + static void php_session_output_handler(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC) { zend_bool do_flush; @@ -107,19 +109,26 @@ } -static void php_session_start_output_handler(INIT_FUNC_ARGS, uint chunk_size) +static void php_session_start_output_handler(uint chunk_size TSRMLS_DC) { - PHP_RINIT(url_scanner)(INIT_FUNC_ARGS_PASSTHRU); - PHP_RINIT(url_scanner_ex)(INIT_FUNC_ARGS_PASSTHRU); + php_url_scanner_activate(TSRMLS_C); + php_url_scanner_ex_activate(TSRMLS_C); php_start_ob_buffer(NULL, chunk_size TSRMLS_CC); php_ob_set_internal_handler(php_session_output_handler, chunk_size TSRMLS_CC); } +static void php_session_activate(TSRMLS_D) +{ +} + + + + static void php_session_end_output_handler(SHUTDOWN_FUNC_ARGS) { - PHP_RSHUTDOWN(url_scanner_ex)(SHUTDOWN_FUNC_ARGS_PASSTHRU); - PHP_RSHUTDOWN(url_scanner)(SHUTDOWN_FUNC_ARGS_PASSTHRU); + php_url_scanner_ex_deactivate(TSRMLS_C); + php_url_scanner_deactivate(TSRMLS_C); } @@ -923,7 +932,10 @@ REGISTER_STRING_CONSTANT("SID", empty_string, 0); PS(define_sid) = define_sid; - PS(session_status)= php_session_active; + PS(session_status) = php_session_active; + if (!send_cookie && PS(use_trans_sid)) { + php_session_start_output_handler(4096 TSRMLS_CC); + } php_session_cache_limiter(TSRMLS_C); php_session_initialize(TSRMLS_C); @@ -1392,10 +1404,6 @@ if (PS(auto_start)) { php_session_start(TSRMLS_C); - } - - if (PS(use_trans_sid)) { - php_session_start_output_handler(INIT_FUNC_ARGS_PASSTHRU, 4096); } return SUCCESS; Index: php4/ext/standard/url_scanner.c diff -u php4/ext/standard/url_scanner.c:1.34 php4/ext/standard/url_scanner.c:1.35 --- php4/ext/standard/url_scanner.c:1.34 Sat Aug 25 12:09:22 2001 +++ php4/ext/standard/url_scanner.c Sun Aug 26 07:49:43 2001 @@ -15,7 +15,7 @@ | Author: Hartmut Holzgraefe <hartmut@six.de> | +----------------------------------------------------------------------+ */ -/* $Id: url_scanner.c,v 1.34 2001/08/25 16:09:22 zeev Exp $ */ +/* $Id: url_scanner.c,v 1.35 2001/08/26 11:49:43 zeev Exp $ */ #include "php.h" @@ -32,14 +32,14 @@ #define BUFSIZE 256 #endif -PHP_RINIT_FUNCTION(url_scanner) +int php_url_scanner_activate(TSRMLS_D) { url_adapt(NULL,0,NULL,NULL); return SUCCESS; } -PHP_RSHUTDOWN_FUNCTION(url_scanner) +int php_url_scanner_deactivate(TSRMLS_D) { url_adapt(NULL,0,NULL,NULL); return SUCCESS; Index: php4/ext/standard/url_scanner.h diff -u php4/ext/standard/url_scanner.h:1.10 php4/ext/standard/url_scanner.h:1.11 --- php4/ext/standard/url_scanner.h:1.10 Sat Aug 11 13:03:37 2001 +++ php4/ext/standard/url_scanner.h Sun Aug 26 07:49:43 2001 @@ -15,13 +15,13 @@ | Author: Sascha Schumann <sascha@schumann.cx> | +----------------------------------------------------------------------+ */ -/* $Id: url_scanner.h,v 1.10 2001/08/11 17:03:37 zeev Exp $ */ +/* $Id: url_scanner.h,v 1.11 2001/08/26 11:49:43 zeev Exp $ */ #ifndef URI_SCANNER_H #define URI_SCANNER_H -PHP_RINIT_FUNCTION(url_scanner); -PHP_RSHUTDOWN_FUNCTION(url_scanner); +int php_url_scanner_activate(TSRMLS_D); +int php_url_scanner_deactivate(TSRMLS_D); char *url_adapt(const char *src, size_t srclen, const char *data, size_t *newlen); Index: php4/ext/standard/url_scanner_ex.c diff -u php4/ext/standard/url_scanner_ex.c:1.39 php4/ext/standard/url_scanner_ex.c:1.40 --- php4/ext/standard/url_scanner_ex.c:1.39 Sat Aug 25 12:09:22 2001 +++ php4/ext/standard/url_scanner_ex.c Sun Aug 26 07:49:43 2001 @@ -860,7 +860,7 @@ return ctx->result.c; } -PHP_RINIT_FUNCTION(url_scanner) +int php_url_scanner_ex_activate(TSRMLS_D) { url_adapt_state_ex_t *ctx; @@ -871,7 +871,7 @@ return SUCCESS; } -PHP_RSHUTDOWN_FUNCTION(url_scanner) +int php_url_scanner_ex_deactivate(TSRMLS_D) { url_adapt_state_ex_t *ctx; Index: php4/ext/standard/url_scanner_ex.h diff -u php4/ext/standard/url_scanner_ex.h:1.13 php4/ext/standard/url_scanner_ex.h:1.14 --- php4/ext/standard/url_scanner_ex.h:1.13 Sat Aug 25 11:57:42 2001 +++ php4/ext/standard/url_scanner_ex.h Sun Aug 26 07:49:43 2001 @@ -21,8 +21,8 @@ PHP_MINIT_FUNCTION(url_scanner_ex); PHP_MSHUTDOWN_FUNCTION(url_scanner_ex); -PHP_RSHUTDOWN_FUNCTION(url_scanner_ex); -PHP_RINIT_FUNCTION(url_scanner_ex); +int php_url_scanner_ex_activate(TSRMLS_D); +int php_url_scanner_ex_deactivate(TSRMLS_D); char *url_adapt_ext_ex(const char *src, size_t srclen, const char *name, const char *value, size_t *newlen, zend_bool do_flush TSRMLS_DC); Index: php4/ext/standard/url_scanner_ex.re diff -u php4/ext/standard/url_scanner_ex.re:1.36 php4/ext/standard/url_scanner_ex.re:1.37 --- php4/ext/standard/url_scanner_ex.re:1.36 Sat Aug 25 12:09:22 2001 +++ php4/ext/standard/url_scanner_ex.re Sun Aug 26 07:49:43 2001 @@ -376,7 +376,7 @@ return ctx->result.c; } -PHP_RINIT_FUNCTION(url_scanner) +int php_url_scanner_ex_activate(TSRMLS_D) { url_adapt_state_ex_t *ctx; @@ -387,7 +387,7 @@ return SUCCESS; } -PHP_RSHUTDOWN_FUNCTION(url_scanner) +int php_url_scanner_ex_deactivate(TSRMLS_D) { url_adapt_state_ex_t *ctx;