Merge r486320 from trunk:

* Handle request bodies larger than 2 GB by converting the Content-Length
  header string of the request correctly to apr_off_t.

PR: 40883

Submitted by: rpluem
Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@509665 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 395c324810192aa0ce4a994039d2d8a02f485aa0..a13d47fe930019d48f47a7e90d2724377feeecf4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.5
 
+  *) mod_proxy_http: Handle request bodies larger than 2 GB by converting
+     the Content-Length header of the request correctly. PR 40883.
+     [Ruediger Pluem, toadie <toadie643 gmail.com>]
+
   *) mod_proxy: Fix some proxy setting inheritance problems (eg:
      ProxyTimeout). PR 11540. [Stuart Children <stuart terminus.co.uk>]
 

diff --git a/STATUS b/STATUS
index 590ef0d255ed936efa44e7cf8247fcc3747fce53..6ee139346d3af1d74c50baf637557136ac7a312b 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -77,11 +77,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_proxy_http: Handle request bodies larger than 2 GB by converting
-     the Content-Length header of the request correctly.
-       PR: 40883
-     http://svn.apache.org/viewvc?view=rev&revision=486320
-     +1: trawick, rpluem, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 

diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index 39a0c563e4c8e4e83030007aa687bc1dbc86f833..5c0de67fc0d24425e300279dbb88af16bfbb1240 100644 (file)
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -333,7 +333,10 @@ static apr_status_t stream_reqbody_cl(apr_pool_t *p,
 
     if (old_cl_val) {
         add_cl(p, bucket_alloc, header_brigade, old_cl_val);
-        cl_val = atol(old_cl_val);
+        if (APR_SUCCESS != (status = apr_strtoff(&cl_val, old_cl_val, NULL,
+                                                 0))) {
+            return status;
+        }
     }
     terminate_headers(bucket_alloc, header_brigade);