From: Yasuo Ohgaki <yohgaki@php.net>
Date: Sun, 11 Aug 2002 02:32:49 +0000 (+0000)
Subject: Changed my mind.
X-Git-Tag: php-4.3.0dev_zend2_alpha3~147
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42355837c1e220a423c66165a0a197f2866259c8;p=php

Changed my mind.
Let users decided whether users want larger chunk size or not.
@ Changed zlib.output_compression behavior. If larger chunk is preferred,
  enable output_buffering also. (Marcus, Yasuo)
---

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 06b0446db6..dd49facf45 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -1013,8 +1013,6 @@ int php_enable_output_compression(int buffer_size TSRMLS_DC)
 		return FAILURE;
 	}
 
-	if (OG(ob_nesting_level)==0)
-		php_start_ob_buffer(NULL, buffer_size, 0 TSRMLS_CC);
 	php_ob_set_internal_handler(php_gzip_output_handler, (uint)(buffer_size*3/2), "zlib output compression", 0 TSRMLS_CC);
 	if (ZLIBG(output_handler) && strlen(ZLIBG(output_handler))) {
 		php_start_ob_buffer_named(ZLIBG(output_handler), 0, 1 TSRMLS_CC);
diff --git a/php.ini-dist b/php.ini-dist
index 1ae8034c0c..a3c9c453da 100644
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -92,21 +92,23 @@ output_buffering = Off
 ; example, if you set output_handler to "mb_output_handler", character
 ; encoding will be transparently converted to the specified encoding.
 ; Setting any output handler automatically turns on output buffering.
-; NOTE: People who wrote portable scripts should not depend on this ini
-; directive. Instead, explicitly set the output handler using ob_start().
-; Using this ini directive may cause problems unless you know what script 
-: is doing.
-; NOTE: You cannot use both "mb_output_handler" with "ob_inconv_handler"
-; and you cannot use both "ob_gzhandler" and "zlib.output_compression". 
+; Note: People who wrote portable scripts should not depend on this ini
+;       directive. Instead, explicitly set the output handler using ob_start().
+;       Using this ini directive may cause problems unless you know what script 
+:       is doing.
+; Note: You cannot use both "mb_output_handler" with "ob_inconv_handler"
+;       and you cannot use both "ob_gzhandler" and "zlib.output_compression". 
 ;output_handler =
 
 ; Transparent output compression using the zlib library
 ; Valid values for this option are 'off', 'on', or a specific buffer size
 ; to be used for compression (default is 4KB)
-;
+; Note: Resulting chunk size may vary due to nature of compression. PHP 
+;       outputs chunks that are few handreds bytes each as a result of compression. 
+;       If you want larger chunk size for better performence, enable output_buffering 
+;       also. 
 ; Note: output_handler must be empty if this is set 'On' !!!!
 ;       Instead you must use zlib.output_handler.
-;
 zlib.output_compression = Off
 
 ; You cannot specify additional output handlers if zlib.output_compression
diff --git a/php.ini-recommended b/php.ini-recommended
index d2cb4cc86a..ec97fac95a 100644
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -105,21 +105,23 @@ output_buffering = 4096
 ; example, if you set output_handler to "mb_output_handler", character
 ; encoding will be transparently converted to the specified encoding.
 ; Setting any output handler automatically turns on output buffering.
-; NOTE: People who wrote portable scripts should not depend on this ini
-; directive. Instead, explicitly set the output handler using ob_start().
-; Using this ini directive may cause problems unless you know what script 
-: is doing.
-; NOTE: You cannot use both "mb_output_handler" with "ob_inconv_handler"
-; and you cannot use both "ob_gzhandler" and "zlib.output_compression". 
+; Note: People who wrote portable scripts should not depend on this ini
+;       directive. Instead, explicitly set the output handler using ob_start().
+;       Using this ini directive may cause problems unless you know what script 
+:       is doing.
+; Note: You cannot use both "mb_output_handler" with "ob_inconv_handler"
+;       and you cannot use both "ob_gzhandler" and "zlib.output_compression". 
 ;output_handler =
 
 ; Transparent output compression using the zlib library
 ; Valid values for this option are 'off', 'on', or a specific buffer size
 ; to be used for compression (default is 4KB)
-;
+; Note: Resulting chunk size may vary due to nature of compression. PHP 
+;       outputs chunks that are few handreds bytes each as a result of compression. 
+;       If you want larger chunk size for better performence, enable output_buffering 
+;       also. 
 ; Note: output_handler must be empty if this is set 'On' !!!!
 ;       Instead you must use zlib.output_handler.
-;
 zlib.output_compression = Off
 
 ; You cannot specify additional output handlers if zlib.output_compression