cvs: php4 /ext/session php_session.h session.c /ext/standard basic_functions.c basic_functions.h url_scanner.c url_scanner_ex.c url_scanner_ex.re
/main config.w32.h
| From: | Zeev Suraski | Date: | Sat, 25 Aug 2001 16:09:23 +0000 |
| Subject: | cvs: php4 /ext/session php_session.h session.c /ext/standard basic_functions.c basic_functions.h url_scanner.c url_scanner_ex.c url_scanner_ex.re /main config.w32.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-7060@lists.php.net to get a copy of this message | ||
zeev Sat Aug 25 12:09:23 2001 EDT
Modified files:
/php4/ext/session php_session.h session.c
/php4/ext/standard basic_functions.c basic_functions.h
url_scanner.c url_scanner_ex.c url_scanner_ex.re
/php4/main config.w32.h
Log:
Get rid of TRANS_SID - it's always possible to use it now.
Index: php4/ext/session/php_session.h diff -u php4/ext/session/php_session.h:1.53 php4/ext/session/php_session.h:1.54 --- php4/ext/session/php_session.h:1.53 Sat Aug 25 11:57:38 2001 +++ php4/ext/session/php_session.h Sat Aug 25 12:09:22 2001 @@ -143,17 +143,13 @@ #define PS_SERIALIZER_ENTRY(x) \ { #x, PS_SERIALIZER_ENCODE_NAME(x), PS_SERIALIZER_DECODE_NAME(x) } -#ifdef TRANS_SID void session_adapt_uris(const char *, size_t, char **, size_t *,zend_bool TSRMLS_DC); void session_adapt_url(const char *, size_t, char **, size_t * TSRMLS_DC); -#else -#define session_adapt_uris(a,b,c,d,e) do { } while(0) -#define session_adapt_url(a,b,c,d) do { } while(0) -#endif void php_set_session_var(char *name, size_t namelen, zval *state_val,HashTable *var_hash TSRMLS_DC); int php_get_session_var(char *name, size_t namelen, zval ***state_var TSRMLS_DC); void php_session_start_output_handler(INIT_FUNC_ARGS, uint chunk_size); +void php_session_end_output_handler(SHUTDOWN_FUNC_ARGS); int php_session_register_module(ps_module *); Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.239 php4/ext/session/session.c:1.240 --- php4/ext/session/session.c:1.239 Sat Aug 25 11:57:38 2001 +++ php4/ext/session/session.c Sat Aug 25 12:09:22 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.239 2001/08/25 15:57:38 zeev Exp $ */ +/* $Id: session.c,v 1.240 2001/08/25 16:09:22 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1280,7 +1280,6 @@ } /* }}} */ -#ifdef TRANS_SID void 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)) { @@ -1295,8 +1294,6 @@ } } -#endif - /* {{{ proto void session_unset(void) Unset all registered variables */ PHP_FUNCTION(session_unset) @@ -1434,10 +1431,19 @@ void php_session_start_output_handler(INIT_FUNC_ARGS, uint chunk_size) { + memset(&BG(url_adapt_state), 0, sizeof(BG(url_adapt_state))); + memset(&BG(url_adapt_state_ex), 0, sizeof(BG(url_adapt_state_ex))); PHP_RINIT(url_scanner)(INIT_FUNC_ARGS_PASSTHRU); PHP_RINIT(url_scanner_ex)(INIT_FUNC_ARGS_PASSTHRU); php_start_ob_buffer(NULL, chunk_size TSRMLS_CC); php_ob_set_internal_handler(php_session_output_handler, chunk_size TSRMLS_CC); +} + + +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); } /* Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.387 php4/ext/standard/basic_functions.c:1.388 --- php4/ext/standard/basic_functions.c:1.387 Sat Aug 25 11:57:40 2001 +++ php4/ext/standard/basic_functions.c Sat Aug 25 12:09:22 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.387 2001/08/25 15:57:40 zeev Exp $ */ +/* $Id: basic_functions.c,v 1.388 2001/08/25 16:09:22 zeev Exp $ */ #include "php.h" #include "php_main.h" @@ -713,11 +713,6 @@ zend_hash_init(&BG(sm_protected_env_vars), 5, NULL, NULL, 1); BG(sm_allowed_env_vars) = NULL; -#ifdef TRANS_SID - memset(&BG(url_adapt_state), 0, sizeof(BG(url_adapt_state))); - memset(&BG(url_adapt_state_ex), 0, sizeof(BG(url_adapt_state_ex))); -#endif - #ifdef PHP_WIN32 CoInitialize(NULL); #endif @@ -794,9 +789,7 @@ PHP_MINIT(syslog)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(array)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(assert)(INIT_FUNC_ARGS_PASSTHRU); -#ifdef TRANS_SID PHP_MINIT(url_scanner_ex)(INIT_FUNC_ARGS_PASSTHRU); -#endif if(PG(allow_url_fopen)) { @@ -835,9 +828,7 @@ PHP_MSHUTDOWN(browscap)(SHUTDOWN_FUNC_ARGS_PASSTHRU); PHP_MSHUTDOWN(array)(SHUTDOWN_FUNC_ARGS_PASSTHRU); PHP_MSHUTDOWN(assert)(SHUTDOWN_FUNC_ARGS_PASSTHRU); -#ifdef TRANS_SID PHP_MSHUTDOWN(url_scanner_ex)(SHUTDOWN_FUNC_ARGS_PASSTHRU); -#endif PHP_MSHUTDOWN(file)(SHUTDOWN_FUNC_ARGS_PASSTHRU); #if defined(HAVE_LOCALECONV) && defined(ZTS) PHP_MSHUTDOWN(localeconv)(SHUTDOWN_FUNC_ARGS_PASSTHRU); @@ -881,11 +872,9 @@ PHP_RINIT(syslog)(INIT_FUNC_ARGS_PASSTHRU); PHP_RINIT(dir)(INIT_FUNC_ARGS_PASSTHRU); -#ifdef TRANS_SID if (BG(use_trans_sid)) { php_session_start_output_handler(INIT_FUNC_ARGS_PASSTHRU, 4096); } -#endif return SUCCESS; } @@ -913,10 +902,9 @@ PHP_RSHUTDOWN(syslog)(SHUTDOWN_FUNC_ARGS_PASSTHRU); PHP_RSHUTDOWN(assert)(SHUTDOWN_FUNC_ARGS_PASSTHRU); -#ifdef TRANS_SID - PHP_RSHUTDOWN(url_scanner_ex)(SHUTDOWN_FUNC_ARGS_PASSTHRU); - PHP_RSHUTDOWN(url_scanner)(SHUTDOWN_FUNC_ARGS_PASSTHRU); -#endif + if (BG(use_trans_sid)) { + php_session_end_output_handler(SHUTDOWN_FUNC_ARGS_PASSTHRU); + } if (BG(user_tick_functions)) { zend_llist_destroy(BG(user_tick_functions)); Index: php4/ext/standard/basic_functions.h diff -u php4/ext/standard/basic_functions.h:1.88 php4/ext/standard/basic_functions.h:1.89 --- php4/ext/standard/basic_functions.h:1.88 Wed Aug 8 16:05:36 2001 +++ php4/ext/standard/basic_functions.h Sat Aug 25 12:09:22 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.h,v 1.88 2001/08/08 20:05:36 zeev Exp $ */ +/* $Id: basic_functions.h,v 1.89 2001/08/25 16:09:22 zeev Exp $ */ #ifndef BASIC_FUNCTIONS_H #define BASIC_FUNCTIONS_H @@ -26,10 +26,8 @@ #include "zend_highlight.h" -#ifdef TRANS_SID -# include "url_scanner.h" -# include "url_scanner_ex.h" -#endif +#include "url_scanner.h" +#include "url_scanner_ex.h" extern zend_module_entry basic_functions_module; #define basic_functions_module_ptr &basic_functions_module @@ -183,12 +181,10 @@ zend_class_entry *incomplete_class; zend_bool use_trans_sid; -#ifdef TRANS_SID /* url_scanner.c */ url_adapt_state_t url_adapt_state; /* url_scanner_ex.re */ url_adapt_state_ex_t url_adapt_state_ex; -#endif #ifdef HAVE_MMAP void *mmap_file; Index: php4/ext/standard/url_scanner.c diff -u php4/ext/standard/url_scanner.c:1.33 php4/ext/standard/url_scanner.c:1.34 --- php4/ext/standard/url_scanner.c:1.33 Sat Jul 28 07:36:19 2001 +++ php4/ext/standard/url_scanner.c Sat Aug 25 12:09:22 2001 @@ -15,12 +15,10 @@ | Author: Hartmut Holzgraefe <hartmut@six.de> | +----------------------------------------------------------------------+ */ -/* $Id: url_scanner.c,v 1.33 2001/07/28 11:36:19 zeev Exp $ */ +/* $Id: url_scanner.c,v 1.34 2001/08/25 16:09:22 zeev Exp $ */ #include "php.h" -#ifdef TRANS_SID - #include "php_globals.h" #include <sys/types.h> @@ -373,7 +371,6 @@ return out; } /* }}} */ -#endif /* * Local variables: Index: php4/ext/standard/url_scanner_ex.c diff -u php4/ext/standard/url_scanner_ex.c:1.38 php4/ext/standard/url_scanner_ex.c:1.39 --- php4/ext/standard/url_scanner_ex.c:1.38 Sat Aug 25 11:57:41 2001 +++ php4/ext/standard/url_scanner_ex.c Sat Aug 25 12:09:22 2001 @@ -20,8 +20,6 @@ #include "php.h" -#ifdef TRANS_SID - #ifdef HAVE_UNISTD_H #include <unistd.h> #endif @@ -906,5 +904,3 @@ free(BG(url_adapt_state_ex).tags); return SUCCESS; } - -#endif Index: php4/ext/standard/url_scanner_ex.re diff -u php4/ext/standard/url_scanner_ex.re:1.35 php4/ext/standard/url_scanner_ex.re:1.36 --- php4/ext/standard/url_scanner_ex.re:1.35 Sat Aug 25 11:57:42 2001 +++ php4/ext/standard/url_scanner_ex.re Sat Aug 25 12:09:22 2001 @@ -18,8 +18,6 @@ #include "php.h" -#ifdef TRANS_SID - #ifdef HAVE_UNISTD_H #include <unistd.h> #endif @@ -422,5 +420,3 @@ free(BG(url_adapt_state_ex).tags); return SUCCESS; } - -#endif Index: php4/main/config.w32.h diff -u php4/main/config.w32.h:1.44 php4/main/config.w32.h:1.45 --- php4/main/config.w32.h:1.44 Sun Jul 22 09:16:15 2001 +++ php4/main/config.w32.h Sat Aug 25 12:09:23 2001 @@ -33,9 +33,6 @@ #define HAVE_CRYPT 0 /* #define HAVE_CRYPT_H 1 */ -/* set to enable trans sid */ -#define TRANS_SID 1 - /* set to enable force cgi redirect */ #define FORCE_CGI_REDIRECT 0
Index: php4/ext/session/php_session.h diff -u php4/ext/session/php_session.h:1.53 php4/ext/session/php_session.h:1.54 --- php4/ext/session/php_session.h:1.53 Sat Aug 25 11:57:38 2001 +++ php4/ext/session/php_session.h Sat Aug 25 12:09:22 2001 @@ -143,17 +143,13 @@ #define PS_SERIALIZER_ENTRY(x) \ { #x, PS_SERIALIZER_ENCODE_NAME(x), PS_SERIALIZER_DECODE_NAME(x) } -#ifdef TRANS_SID void session_adapt_uris(const char *, size_t, char **, size_t *,zend_bool TSRMLS_DC); void session_adapt_url(const char *, size_t, char **, size_t * TSRMLS_DC); -#else -#define session_adapt_uris(a,b,c,d,e) do { } while(0) -#define session_adapt_url(a,b,c,d) do { } while(0) -#endif void php_set_session_var(char *name, size_t namelen, zval *state_val,HashTable *var_hash TSRMLS_DC); int php_get_session_var(char *name, size_t namelen, zval ***state_var TSRMLS_DC); void php_session_start_output_handler(INIT_FUNC_ARGS, uint chunk_size); +void php_session_end_output_handler(SHUTDOWN_FUNC_ARGS); int php_session_register_module(ps_module *); Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.239 php4/ext/session/session.c:1.240 --- php4/ext/session/session.c:1.239 Sat Aug 25 11:57:38 2001 +++ php4/ext/session/session.c Sat Aug 25 12:09:22 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.239 2001/08/25 15:57:38 zeev Exp $ */ +/* $Id: session.c,v 1.240 2001/08/25 16:09:22 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1280,7 +1280,6 @@ } /* }}} */ -#ifdef TRANS_SID void 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)) { @@ -1295,8 +1294,6 @@ } } -#endif - /* {{{ proto void session_unset(void) Unset all registered variables */ PHP_FUNCTION(session_unset) @@ -1434,10 +1431,19 @@ void php_session_start_output_handler(INIT_FUNC_ARGS, uint chunk_size) { + memset(&BG(url_adapt_state), 0, sizeof(BG(url_adapt_state))); + memset(&BG(url_adapt_state_ex), 0, sizeof(BG(url_adapt_state_ex))); PHP_RINIT(url_scanner)(INIT_FUNC_ARGS_PASSTHRU); PHP_RINIT(url_scanner_ex)(INIT_FUNC_ARGS_PASSTHRU); php_start_ob_buffer(NULL, chunk_size TSRMLS_CC); php_ob_set_internal_handler(php_session_output_handler, chunk_size TSRMLS_CC); +} + + +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); } /* Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.387 php4/ext/standard/basic_functions.c:1.388 --- php4/ext/standard/basic_functions.c:1.387 Sat Aug 25 11:57:40 2001 +++ php4/ext/standard/basic_functions.c Sat Aug 25 12:09:22 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.387 2001/08/25 15:57:40 zeev Exp $ */ +/* $Id: basic_functions.c,v 1.388 2001/08/25 16:09:22 zeev Exp $ */ #include "php.h" #include "php_main.h" @@ -713,11 +713,6 @@ zend_hash_init(&BG(sm_protected_env_vars), 5, NULL, NULL, 1); BG(sm_allowed_env_vars) = NULL; -#ifdef TRANS_SID - memset(&BG(url_adapt_state), 0, sizeof(BG(url_adapt_state))); - memset(&BG(url_adapt_state_ex), 0, sizeof(BG(url_adapt_state_ex))); -#endif - #ifdef PHP_WIN32 CoInitialize(NULL); #endif @@ -794,9 +789,7 @@ PHP_MINIT(syslog)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(array)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(assert)(INIT_FUNC_ARGS_PASSTHRU); -#ifdef TRANS_SID PHP_MINIT(url_scanner_ex)(INIT_FUNC_ARGS_PASSTHRU); -#endif if(PG(allow_url_fopen)) { @@ -835,9 +828,7 @@ PHP_MSHUTDOWN(browscap)(SHUTDOWN_FUNC_ARGS_PASSTHRU); PHP_MSHUTDOWN(array)(SHUTDOWN_FUNC_ARGS_PASSTHRU); PHP_MSHUTDOWN(assert)(SHUTDOWN_FUNC_ARGS_PASSTHRU); -#ifdef TRANS_SID PHP_MSHUTDOWN(url_scanner_ex)(SHUTDOWN_FUNC_ARGS_PASSTHRU); -#endif PHP_MSHUTDOWN(file)(SHUTDOWN_FUNC_ARGS_PASSTHRU); #if defined(HAVE_LOCALECONV) && defined(ZTS) PHP_MSHUTDOWN(localeconv)(SHUTDOWN_FUNC_ARGS_PASSTHRU); @@ -881,11 +872,9 @@ PHP_RINIT(syslog)(INIT_FUNC_ARGS_PASSTHRU); PHP_RINIT(dir)(INIT_FUNC_ARGS_PASSTHRU); -#ifdef TRANS_SID if (BG(use_trans_sid)) { php_session_start_output_handler(INIT_FUNC_ARGS_PASSTHRU, 4096); } -#endif return SUCCESS; } @@ -913,10 +902,9 @@ PHP_RSHUTDOWN(syslog)(SHUTDOWN_FUNC_ARGS_PASSTHRU); PHP_RSHUTDOWN(assert)(SHUTDOWN_FUNC_ARGS_PASSTHRU); -#ifdef TRANS_SID - PHP_RSHUTDOWN(url_scanner_ex)(SHUTDOWN_FUNC_ARGS_PASSTHRU); - PHP_RSHUTDOWN(url_scanner)(SHUTDOWN_FUNC_ARGS_PASSTHRU); -#endif + if (BG(use_trans_sid)) { + php_session_end_output_handler(SHUTDOWN_FUNC_ARGS_PASSTHRU); + } if (BG(user_tick_functions)) { zend_llist_destroy(BG(user_tick_functions)); Index: php4/ext/standard/basic_functions.h diff -u php4/ext/standard/basic_functions.h:1.88 php4/ext/standard/basic_functions.h:1.89 --- php4/ext/standard/basic_functions.h:1.88 Wed Aug 8 16:05:36 2001 +++ php4/ext/standard/basic_functions.h Sat Aug 25 12:09:22 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.h,v 1.88 2001/08/08 20:05:36 zeev Exp $ */ +/* $Id: basic_functions.h,v 1.89 2001/08/25 16:09:22 zeev Exp $ */ #ifndef BASIC_FUNCTIONS_H #define BASIC_FUNCTIONS_H @@ -26,10 +26,8 @@ #include "zend_highlight.h" -#ifdef TRANS_SID -# include "url_scanner.h" -# include "url_scanner_ex.h" -#endif +#include "url_scanner.h" +#include "url_scanner_ex.h" extern zend_module_entry basic_functions_module; #define basic_functions_module_ptr &basic_functions_module @@ -183,12 +181,10 @@ zend_class_entry *incomplete_class; zend_bool use_trans_sid; -#ifdef TRANS_SID /* url_scanner.c */ url_adapt_state_t url_adapt_state; /* url_scanner_ex.re */ url_adapt_state_ex_t url_adapt_state_ex; -#endif #ifdef HAVE_MMAP void *mmap_file; Index: php4/ext/standard/url_scanner.c diff -u php4/ext/standard/url_scanner.c:1.33 php4/ext/standard/url_scanner.c:1.34 --- php4/ext/standard/url_scanner.c:1.33 Sat Jul 28 07:36:19 2001 +++ php4/ext/standard/url_scanner.c Sat Aug 25 12:09:22 2001 @@ -15,12 +15,10 @@ | Author: Hartmut Holzgraefe <hartmut@six.de> | +----------------------------------------------------------------------+ */ -/* $Id: url_scanner.c,v 1.33 2001/07/28 11:36:19 zeev Exp $ */ +/* $Id: url_scanner.c,v 1.34 2001/08/25 16:09:22 zeev Exp $ */ #include "php.h" -#ifdef TRANS_SID - #include "php_globals.h" #include <sys/types.h> @@ -373,7 +371,6 @@ return out; } /* }}} */ -#endif /* * Local variables: Index: php4/ext/standard/url_scanner_ex.c diff -u php4/ext/standard/url_scanner_ex.c:1.38 php4/ext/standard/url_scanner_ex.c:1.39 --- php4/ext/standard/url_scanner_ex.c:1.38 Sat Aug 25 11:57:41 2001 +++ php4/ext/standard/url_scanner_ex.c Sat Aug 25 12:09:22 2001 @@ -20,8 +20,6 @@ #include "php.h" -#ifdef TRANS_SID - #ifdef HAVE_UNISTD_H #include <unistd.h> #endif @@ -906,5 +904,3 @@ free(BG(url_adapt_state_ex).tags); return SUCCESS; } - -#endif Index: php4/ext/standard/url_scanner_ex.re diff -u php4/ext/standard/url_scanner_ex.re:1.35 php4/ext/standard/url_scanner_ex.re:1.36 --- php4/ext/standard/url_scanner_ex.re:1.35 Sat Aug 25 11:57:42 2001 +++ php4/ext/standard/url_scanner_ex.re Sat Aug 25 12:09:22 2001 @@ -18,8 +18,6 @@ #include "php.h" -#ifdef TRANS_SID - #ifdef HAVE_UNISTD_H #include <unistd.h> #endif @@ -422,5 +420,3 @@ free(BG(url_adapt_state_ex).tags); return SUCCESS; } - -#endif Index: php4/main/config.w32.h diff -u php4/main/config.w32.h:1.44 php4/main/config.w32.h:1.45 --- php4/main/config.w32.h:1.44 Sun Jul 22 09:16:15 2001 +++ php4/main/config.w32.h Sat Aug 25 12:09:23 2001 @@ -33,9 +33,6 @@ #define HAVE_CRYPT 0 /* #define HAVE_CRYPT_H 1 */ -/* set to enable trans sid */ -#define TRANS_SID 1 - /* set to enable force cgi redirect */ #define FORCE_CGI_REDIRECT 0