diff options
| author | Zeev Suraski <zeev@php.net> | 2001-08-26 01:09:20 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-08-26 01:09:20 +0000 |
| commit | 7b73aee40fd3a23e4a45b02f1ed165de77126e24 (patch) | |
| tree | 2343d16276f89f5f3738633056e9528dd77e7134 /ext/standard | |
| parent | 41562f6ca28bcb37a29dc4facf291e3c66fb0a86 (diff) | |
| download | php-git-7b73aee40fd3a23e4a45b02f1ed165de77126e24.tar.gz | |
Make the session module more independent
Diffstat (limited to 'ext/standard')
| -rw-r--r-- | ext/standard/basic_functions.c | 13 | ||||
| -rw-r--r-- | ext/standard/basic_functions.h | 1 |
2 files changed, 3 insertions, 11 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index dd3fe898ee..93cc62edad 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -662,7 +662,6 @@ static PHP_INI_MH(OnUpdateSafeModeAllowedEnvVars) PHP_INI_BEGIN() PHP_INI_ENTRY_EX("safe_mode_protected_env_vars", SAFE_MODE_PROTECTED_ENV_VARS, PHP_INI_SYSTEM, OnUpdateSafeModeProtectedEnvVars, NULL) PHP_INI_ENTRY_EX("safe_mode_allowed_env_vars", SAFE_MODE_ALLOWED_ENV_VARS, PHP_INI_SYSTEM, OnUpdateSafeModeAllowedEnvVars, NULL) - STD_PHP_INI_ENTRY("session.use_trans_sid", "1", PHP_INI_ALL, OnUpdateBool, use_trans_sid, php_basic_globals, basic_globals) PHP_INI_END() @@ -713,6 +712,9 @@ 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; + memset(&BG(url_adapt_state), 0, sizeof(BG(url_adapt_state))); + memset(&BG(url_adapt_state_ex), 0, sizeof(BG(url_adapt_state_ex))); + #ifdef PHP_WIN32 CoInitialize(NULL); #endif @@ -871,11 +873,6 @@ PHP_RINIT_FUNCTION(basic) PHP_RINIT(filestat)(INIT_FUNC_ARGS_PASSTHRU); PHP_RINIT(syslog)(INIT_FUNC_ARGS_PASSTHRU); PHP_RINIT(dir)(INIT_FUNC_ARGS_PASSTHRU); - - if (BG(use_trans_sid)) { - php_session_start_output_handler(INIT_FUNC_ARGS_PASSTHRU, 4096); - } - return SUCCESS; } @@ -902,10 +899,6 @@ PHP_RSHUTDOWN_FUNCTION(basic) PHP_RSHUTDOWN(syslog)(SHUTDOWN_FUNC_ARGS_PASSTHRU); PHP_RSHUTDOWN(assert)(SHUTDOWN_FUNC_ARGS_PASSTHRU); - 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)); efree(BG(user_tick_functions)); diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h index e31eb230fd..82a698ec82 100644 --- a/ext/standard/basic_functions.h +++ b/ext/standard/basic_functions.h @@ -179,7 +179,6 @@ typedef struct { /* var.c */ zend_class_entry *incomplete_class; - zend_bool use_trans_sid; /* url_scanner.c */ url_adapt_state_t url_adapt_state; |