mike Mon Jan 29 13:04:57 2007 UTC
Modified files:
/php-src/main output.c
Log:
- don't do memory limit checks for chunk_size
http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.204&r2=1.205&diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.204 php-src/main/output.c:1.205
--- php-src/main/output.c:1.204 Mon Jan 1 09:29:35 2007
+++ php-src/main/output.c Mon Jan 29 13:04:57 2007
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.204 2007/01/01 09:29:35 sebastian Exp $ */
+/* $Id: output.c,v 1.205 2007/01/29 13:04:57 mike Exp $ */
#ifndef PHP_OUTPUT_DEBUG
# define PHP_OUTPUT_DEBUG 0
@@ -887,20 +887,11 @@
static inline php_output_handler *php_output_handler_init_ex(zval *name,
size_t chunk_size, int flags TSRMLS_DC)
{
php_output_handler *handler;
- size_t mem_limit;
handler = ecalloc(1, sizeof(php_output_handler));
ZVAL_ADDREF(name);
handler->name = name;
-
- mem_limit = (PG(memory_limit) - zend_memory_usage(1 TSRMLS_CC)) / 2;
- if (!chunk_size || chunk_size > mem_limit) {
- handler->size = mem_limit;
- chunk_size = 0;
- } else {
- handler->size = chunk_size;
- }
-
+ handler->size = chunk_size;
handler->flags = flags;
handler->buffer.size = PHP_OUTPUT_HANDLER_INITBUF_SIZE(chunk_size);
handler->buffer.data = emalloc(handler->buffer.size);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
