cvs: php4 /ext/standard basic_functions.c basic_functions.h output.c

sterling Mon Sep 4 15:21:10 2000 EDT Modified files: /php4/ext/standard basic_functions.c basic_functions.h output.c Log: @Add a php.ini option session.use_trans_sid to enable/disable trans-sid. (Sterling) Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.245 php4/ext/standard/basic_functions.c:1.246 --- php4/ext/standard/basic_functions.c:1.245 Sat Sep 2 08:54:18 2000 +++ php4/ext/standard/basic_functions.c Mon Sep 4 15:21:09 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.245 2000/09/02 15:54:18 rubys Exp $ */ +/* $Id: basic_functions.c,v 1.246 2000/09/04 22:21:09 sterling Exp $ */ #include "php.h" #include "php_main.h" @@ -588,6 +588,7 @@ 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() @@ -755,7 +756,9 @@ PHP_RINIT(dir)(INIT_FUNC_ARGS_PASSTHRU); #ifdef TRANS_SID - PHP_RINIT(url_scanner)(INIT_FUNC_ARGS_PASSTHRU); + if (BG(use_trans_sid)) { + PHP_RINIT(url_scanner)(INIT_FUNC_ARGS_PASSTHRU); + } #endif return SUCCESS; Index: php4/ext/standard/basic_functions.h diff -u php4/ext/standard/basic_functions.h:1.61 php4/ext/standard/basic_functions.h:1.62 --- php4/ext/standard/basic_functions.h:1.61 Fri Sep 1 09:10:17 2000 +++ php4/ext/standard/basic_functions.h Mon Sep 4 15:21:10 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.h,v 1.61 2000/09/01 16:10:17 andrei Exp $ */ +/* $Id: basic_functions.h,v 1.62 2000/09/04 22:21:10 sterling Exp $ */ #ifndef BASIC_FUNCTIONS_H #define BASIC_FUNCTIONS_H @@ -169,6 +169,7 @@ /* var.c */ zend_class_entry *incomplete_class; + zend_bool use_trans_sid; #ifdef TRANS_SID /* url_scanner.c */ Index: php4/ext/standard/output.c diff -u php4/ext/standard/output.c:1.31 php4/ext/standard/output.c:1.32 --- php4/ext/standard/output.c:1.31 Sun Sep 3 12:57:06 2000 +++ php4/ext/standard/output.c Mon Sep 4 15:21:10 2000 @@ -17,11 +17,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: output.c,v 1.31 2000/09/03 19:57:06 andi Exp $ */ +/* $Id: output.c,v 1.32 2000/09/04 22:21:10 sterling Exp $ */ #include "php.h" #include "ext/standard/head.h" #include "ext/session/php_session.h" +#include "basic_functions.h" #include "SAPI.h" /* output functions */ @@ -332,8 +333,11 @@ uint new_length=0; int result; OLS_FETCH(); + BLS_FETCH(); - session_adapt_uris(str, str_length, &newstr, &new_length); + if (BG(use_trans_sid)) { + session_adapt_uris(str, str_length, &newstr, &new_length); + } if (newstr) { str = newstr;