* A limit of zero means unlimited for LimitRequestBody.

PR: 54435
Submitted by: Pavel Mateja <pavel netsafe.cz>
Reviewed by: rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1433988 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 7160234a8b3c7f78a75633c3da755184bed14f7c..c87d2a1093cbf84cdd3d7eb9e4a845f536bec8df 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,12 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_proxy_http: Honour special value 0 (unlimited) of LimitRequestBody
+     PR 54435.  [Pavel Mateja <pavel netsafe.cz>]
+
   *) mod_lua: Add bindings for apr_dbd/mod_dbd database access
      [Daniel Gruno]
-     
+
   *) mod_authn_file, mod_authn_dbd, mod_authn_dbm, mod_authn_socache:
      Cache the result of the most recent password hash verification for every
      keep-alive connection. This saves some expensive calculations.

diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index 243c9a5e7dfc2262e40717f4a8da4af3235b3a07..07b5408d3cddbfb5513c7e9767e49d0fd2d449cb 100644 (file)
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -587,7 +587,7 @@ static int spool_reqbody_cl(apr_pool_t *p,
              * Let it take effect if we decide to store the body in a
              * temporary file on disk.
              */
-            if (bytes_spooled + bytes > limit) {
+            if (limit && (bytes_spooled + bytes > limit)) {
                 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01088)
                               "Request body is larger than the configured "
                               "limit of %" APR_OFF_T_FMT, limit);