svn commit: r1042894 - in /httpd/apreq/trunk/module/apache2: apreq_module_apache2.h filter.c

[joes]

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;
 }
-