From b8763a6f8c4de609df0a086b10da617eed56578b Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Sat, 25 Aug 2001 16:09:23 +0000 Subject: [PATCH] Get rid of TRANS_SID - it's always possible to use it now. --- ext/session/php_session.h | 6 +----- ext/session/session.c | 12 +++++++++--- ext/standard/basic_functions.c | 18 +++--------------- ext/standard/basic_functions.h | 8 ++------ ext/standard/url_scanner.c | 3 --- ext/standard/url_scanner_ex.c | 4 ---- ext/standard/url_scanner_ex.re | 4 ---- main/config.w32.h | 3 --- 8 files changed, 15 insertions(+), 43 deletions(-) diff --git a/ext/session/php_session.h b/ext/session/php_session.h index 453f3a7d82..6ddcb4bd7e 100644 --- a/ext/session/php_session.h +++ b/ext/session/php_session.h @@ -143,17 +143,13 @@ typedef struct ps_serializer_struct { #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 *); diff --git a/ext/session/session.c b/ext/session/session.c index af3c63a4d5..c71e598c01 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1280,7 +1280,6 @@ PHP_FUNCTION(session_destroy) } /* }}} */ -#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 @@ void session_adapt_url(const char *url, size_t urllen, char **new, size_t *newle } } -#endif - /* {{{ proto void session_unset(void) Unset all registered variables */ PHP_FUNCTION(session_unset) @@ -1434,12 +1431,21 @@ static void php_session_output_handler(char *output, uint output_len, char **han 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); +} + /* * Local variables: * tab-width: 4 diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 7f680af675..dd3fe898ee 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -713,11 +713,6 @@ static void basic_globals_ctor(php_basic_globals *basic_globals_p TSRMLS_DC) 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_FUNCTION(basic) 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_FUNCTION(basic) 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_FUNCTION(basic) 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_FUNCTION(basic) 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)); diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h index 6001628b66..e31eb230fd 100644 --- a/ext/standard/basic_functions.h +++ b/ext/standard/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 @@ typedef struct { 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; diff --git a/ext/standard/url_scanner.c b/ext/standard/url_scanner.c index 07b46f7fa2..b316cee866 100644 --- a/ext/standard/url_scanner.c +++ b/ext/standard/url_scanner.c @@ -19,8 +19,6 @@ #include "php.h" -#ifdef TRANS_SID - #include "php_globals.h" #include @@ -373,7 +371,6 @@ char *url_adapt(const char *src, size_t srclen, const char *data, size_t *newlen return out; } /* }}} */ -#endif /* * Local variables: diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c index 0c397cd2a6..e3ed2ca95b 100644 --- a/ext/standard/url_scanner_ex.c +++ b/ext/standard/url_scanner_ex.c @@ -20,8 +20,6 @@ #include "php.h" -#ifdef TRANS_SID - #ifdef HAVE_UNISTD_H #include #endif @@ -906,5 +904,3 @@ PHP_MSHUTDOWN_FUNCTION(url_scanner) free(BG(url_adapt_state_ex).tags); return SUCCESS; } - -#endif diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re index b0dc0af4ee..31809471df 100644 --- a/ext/standard/url_scanner_ex.re +++ b/ext/standard/url_scanner_ex.re @@ -18,8 +18,6 @@ #include "php.h" -#ifdef TRANS_SID - #ifdef HAVE_UNISTD_H #include #endif @@ -422,5 +420,3 @@ PHP_MSHUTDOWN_FUNCTION(url_scanner) free(BG(url_adapt_state_ex).tags); return SUCCESS; } - -#endif diff --git a/main/config.w32.h b/main/config.w32.h index 87b1841546..60c56db7a3 100644 --- a/main/config.w32.h +++ b/main/config.w32.h @@ -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 -- 2.40.0