Commit 9ba3f744 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent 6c8f848a

CHANGES

+4 −0
Original line number Diff line number Diff line 
                                                        -*- 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>]















































STATUS



+0
−5






























Original line number
Diff line number
Diff line








@@ -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:

















































modules/proxy/mod_proxy_http.c



+4
−1






























Original line number
Diff line number
Diff line








@@ -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);