Merge r1649043 from trunk:

mod_proxy_ajp: Fix get_content_length().

clength in request_rec is for response sizes,
not request body size. It is initialized to 0,
so the "if" branch was never taken.

Submitted by: rjung
Reviewed/backported by: jim

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

diff --git a/STATUS b/STATUS
index d5bc41c85b3c498490f736d26761818dd5efe89c..47a90b863bda5332d9b7c7aba94aa8736474f302 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -110,13 +110,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=32209
      +1: druggeri, gsmith, rjung
 
-   * mod_proxy_ajp: Fix get_content_length().
-     clength in request_rec is for response sizes, not request body size.
-     It is initialized to 0, so the "if" branch was never taken.
-     trunk patch: http://svn.apache.org/r1649043
-     2.4.x patch: trunks works (plus CHANGES)
-     +1 rjung, covener, jim
-
    * mod_include: the 'env' function was incorrectly handled as 'getenv' if the
      leading 'e' was written in upper case in <!--#if expr="..." -->
      statements. [Christophe Jaillet]

diff --git a/modules/proxy/mod_proxy_ajp.c b/modules/proxy/mod_proxy_ajp.c
index cf52a7d97af0f72bf07fa39b4c55c88957a219e5..6a83aa2ffec82d3170d25f219744a15af126f688 100644 (file)
--- a/modules/proxy/mod_proxy_ajp.c
+++ b/modules/proxy/mod_proxy_ajp.c
@@ -123,10 +123,7 @@ static apr_off_t get_content_length(request_rec * r)
 {
     apr_off_t len = 0;
 
-    if (r->clength > 0) {
-        return r->clength;
-    }
-    else if (r->main == NULL) {
+    if (r->main == NULL) {
         const char *clp = apr_table_get(r->headers_in, "Content-Length");
 
         if (clp) {