You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2007/02/20 18:12:56 UTC
svn commit: r509665 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/proxy/mod_proxy_http.c
Author: jim
Date: Tue Feb 20 09:12:55 2007
New Revision: 509665
URL: http://svn.apache.org/viewvc?view=rev&rev=509665
Log:
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
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?view=diff&rev=509665&r1=509664&r2=509665
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Feb 20 09:12:55 2007
@@ -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>]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=509665&r1=509664&r2=509665
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue Feb 20 09:12:55 2007
@@ -77,11 +77,6 @@
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:
Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c?view=diff&rev=509665&r1=509664&r2=509665
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c Tue Feb 20 09:12:55 2007
@@ -333,7 +333,10 @@
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);