From: Rainer Jung <rjung@apache.org>
Date: Thu, 21 May 2015 10:43:20 +0000 (+0000)
Subject: mod_proxy_ajp: Fix get_content_length().
X-Git-Tag: 2.2.30~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93ac797fdb17beebadfdd8eb7b624ee64740d43d;p=thirdparty%2Fapache%2Fhttpd.git

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 and thus there's no
functional change (and no CHANGES).

Backport of r1649043 from trunk resp. r1651096 from 2.4.x.

Committed By: rjung
Reviewed By: rjung, ylavic, wrowe
Backported By: rjung


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

diff --git a/STATUS b/STATUS
index 6e1dd9b2828..e34064ed35b 100644
--- a/STATUS
+++ b/STATUS
@@ -108,13 +108,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      ylavic: trunk/2.4.x not concerned, 2.2.x only.
      +1: ylavic, jkaluza, wrowe
 
-   * 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.2.x patch: trunks works (plus CHANGES)
-     +1 rjung, ylavic, wrowe
-
    * mod_ssl: Add support for configuring persistent TLS session ticket
      encryption/decryption keys (useful for clustered environments).
      [Paul Querna, Kaspar Brand]
diff --git a/modules/proxy/mod_proxy_ajp.c b/modules/proxy/mod_proxy_ajp.c
index f87398999e1..8e59b1beb42 100644
--- a/modules/proxy/mod_proxy_ajp.c
+++ b/modules/proxy/mod_proxy_ajp.c
@@ -120,10 +120,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) {