diff options
| author | Sebastian Bergmann <sebastian@php.net> | 2002-09-01 11:33:19 +0000 |
|---|---|---|
| committer | Sebastian Bergmann <sebastian@php.net> | 2002-09-01 11:33:19 +0000 |
| commit | 714c19fe66dd5feef380eccb4606be5193381c13 (patch) | |
| tree | 1a0988ce5697b068f13d47d0321f01784dafc973 /main/main.c | |
| parent | 73cf316a5306cfef44e87a60589b80f5e6ec6a52 (diff) | |
| download | php-git-714c19fe66dd5feef380eccb4606be5193381c13.tar.gz | |
Per discussion on #php.bugs (+1 from at least Derick and Jani), revert double_buffering.
Diffstat (limited to 'main/main.c')
| -rw-r--r-- | main/main.c | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/main/main.c b/main/main.c index 31dfdd71cf..8ff085b5e1 100644 --- a/main/main.c +++ b/main/main.c @@ -197,24 +197,6 @@ static PHP_INI_MH(OnUpdateTimeout) } /* }}} */ -/* {{{ OnUpdateOutputBuffering - */ -static PHP_INI_MH(OnUpdateOutputBuffering) -{ - if(!strncasecmp(new_value, "off", sizeof("off"))) { - new_value = "0"; - new_value_length = sizeof("0"); - } else if(!strncasecmp(new_value, "on", sizeof("on"))) { - new_value = "1"; - new_value_length = sizeof("1"); - } - OnUpdateInt(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); - - return SUCCESS; -} -/* }}} */ - - /* Need to convert to strings and make use of: * PHP_SAFE_MODE * @@ -267,8 +249,7 @@ PHP_INI_BEGIN() STD_PHP_INI_BOOLEAN("magic_quotes_gpc", "1", PHP_INI_ALL, OnUpdateBool, magic_quotes_gpc, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("magic_quotes_runtime", "0", PHP_INI_ALL, OnUpdateBool, magic_quotes_runtime, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("magic_quotes_sybase", "0", PHP_INI_ALL, OnUpdateBool, magic_quotes_sybase, php_core_globals, core_globals) - STD_PHP_INI_ENTRY("output_buffering", "0", PHP_INI_PERDIR|PHP_INI_SYSTEM,OnUpdateOutputBuffering, output_buffering, php_core_globals, core_globals) - STD_PHP_INI_ENTRY("double_buffering", "0", PHP_INI_PERDIR|PHP_INI_SYSTEM,OnUpdateOutputBuffering, double_buffering, php_core_globals, core_globals) + STD_PHP_INI_ENTRY("output_buffering", "0", PHP_INI_PERDIR|PHP_INI_SYSTEM,OnUpdateInt, output_buffering, php_core_globals, core_globals) STD_PHP_INI_ENTRY("output_handler", NULL, PHP_INI_PERDIR|PHP_INI_SYSTEM,OnUpdateString, output_handler, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("register_argc_argv", "1", PHP_INI_PERDIR|PHP_INI_SYSTEM,OnUpdateBool, register_argc_argv, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("register_globals", "0", PHP_INI_PERDIR|PHP_INI_SYSTEM,OnUpdateBool, register_globals, php_core_globals, core_globals) @@ -846,7 +827,12 @@ int php_request_startup(TSRMLS_D) php_start_ob_buffer_named(PG(output_handler), 0, 1 TSRMLS_CC); } else if (PG(output_buffering)) { - php_start_ob_buffer(NULL, 0, 1 TSRMLS_CC); + if (PG(output_buffering)>1) { + php_start_ob_buffer(NULL, PG(output_buffering), 0 TSRMLS_CC); + } + else { + php_start_ob_buffer(NULL, 0, 1 TSRMLS_CC); + } } else if (PG(implicit_flush)) { php_start_implicit_flush(TSRMLS_C); |