cvs: php4 /ext/zlib zlib.c
| From: | Marcus B�rger | Date: | Sat, 10 Aug 2002 12:58:47 +0000 |
| Subject: | cvs: php4 /ext/zlib zlib.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13244@lists.php.net to get a copy of this message | ||
helly Sat Aug 10 08:58:47 2002 EDT
Modified files:
/php4/ext/zlib zlib.c
Log:
no need to start additional first buffer when output compression is first buffer
Index: php4/ext/zlib/zlib.c
diff -u php4/ext/zlib/zlib.c:1.139 php4/ext/zlib/zlib.c:1.140
--- php4/ext/zlib/zlib.c:1.139 Sat Aug 10 06:40:59 2002
+++ php4/ext/zlib/zlib.c Sat Aug 10 08:58:46 2002
@@ -18,7 +18,7 @@
| Jade Nicoletti <nicoletti@nns.ch> |
+----------------------------------------------------------------------+
*/
-/* $Id: zlib.c,v 1.139 2002/08/10 10:40:59 helly Exp $ */
+/* $Id: zlib.c,v 1.140 2002/08/10 12:58:46 helly Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -1013,7 +1013,8 @@
return FAILURE;
}
- php_start_ob_buffer(NULL, buffer_size, 0 TSRMLS_CC);
+ 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*1.5f), "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);