Return-Path: Delivered-To: apmail-httpd-apreq-cvs-archive@www.apache.org Received: (qmail 94094 invoked from network); 7 Dec 2010 02:48:02 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 7 Dec 2010 02:48:02 -0000 Received: (qmail 61598 invoked by uid 500); 7 Dec 2010 02:48:02 -0000 Delivered-To: apmail-httpd-apreq-cvs-archive@httpd.apache.org Received: (qmail 61560 invoked by uid 500); 7 Dec 2010 02:48:01 -0000 Mailing-List: contact apreq-cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: apreq-dev@httpd.apache.org List-Post: List-Help: List-Unsubscribe: List-Id: Delivered-To: mailing list apreq-cvs@httpd.apache.org Received: (qmail 61553 invoked by uid 99); 7 Dec 2010 02:48:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Dec 2010 02:48:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Dec 2010 02:47:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 07C1423888D2; Tue, 7 Dec 2010 02:47:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1042894 - in /httpd/apreq/trunk/module/apache2: apreq_module_apache2.h filter.c Date: Tue, 07 Dec 2010 02:47:37 -0000 To: apreq-cvs@httpd.apache.org From: joes@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101207024738.07C1423888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: joes Date: Tue Dec 7 02:47:37 2010 New Revision: 1042894 URL: http://svn.apache.org/viewvc?rev=1042894&view=rev Log: merge was broken Modified: httpd/apreq/trunk/module/apache2/apreq_module_apache2.h httpd/apreq/trunk/module/apache2/filter.c Modified: httpd/apreq/trunk/module/apache2/apreq_module_apache2.h URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/module/apache2/apreq_module_apache2.h?rev=1042894&r1=1042893&r2=1042894&view=diff ============================================================================== --- httpd/apreq/trunk/module/apache2/apreq_module_apache2.h (original) +++ httpd/apreq/trunk/module/apache2/apreq_module_apache2.h Tue Dec 7 02:47:37 2010 @@ -171,7 +171,7 @@ APR_DECLARE_OPTIONAL_FN(APREQ_DECLARE(ap * using this apache2 module * @see APREQ_MODULE */ -#define APREQ_APACHE2_MMN 20090110 +#define APREQ_APACHE2_MMN 20101207 /** @} */ Modified: httpd/apreq/trunk/module/apache2/filter.c URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/module/apache2/filter.c?rev=1042894&r1=1042893&r2=1042894&view=diff ============================================================================== --- httpd/apreq/trunk/module/apache2/filter.c (original) +++ httpd/apreq/trunk/module/apache2/filter.c Tue Dec 7 02:47:37 2010 @@ -35,8 +35,8 @@ static void *apreq_create_dir_config(apr /* d == OR_ALL */ struct dir_config *dc = apr_palloc(p, sizeof *dc); dc->temp_dir = NULL; - dc->read_limit = APREQ_DEFAULT_READ_LIMIT; - dc->brigade_limit = APREQ_DEFAULT_BRIGADE_LIMIT; + dc->read_limit = -1; + dc->brigade_limit = -1; return dc; } @@ -50,7 +50,7 @@ static void *apreq_merge_dir_config(apr_ c->brigade_limit = (b->brigade_limit == (apr_size_t)-1) /* overrides ok */ ? a->brigade_limit : b->brigade_limit; - c->read_limit = (b->read_limit < a->read_limit) /* why min? */ + c->read_limit = (b->read_limit < a->read_limit) /* yes, min */ ? b->read_limit : a->read_limit; return c; @@ -530,10 +530,11 @@ void apreq_filter_make_context(ap_filter ctx->brigade_limit = APREQ_DEFAULT_BRIGADE_LIMIT; } else { ctx->temp_dir = d->temp_dir; - ctx->read_limit = d->read_limit; - ctx->brigade_limit = d->brigade_limit; + ctx->read_limit = (d->read_limit == (apr_uint64_t)-1) + ? APREQ_DEFAULT_READ_LIMIT : d->read_limit; + ctx->brigade_limit = (d->brigade_limit == (apr_size_t)-1) + ? APREQ_DEFAULT_BRIGADE_LIMIT : d->brigade_limit; } f->ctx = ctx; } -