Commit 873f100f authored by Rainer Jung's avatar Rainer Jung
Browse files

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
parent fe6ba4a9

STATUS

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

modules/proxy/mod_proxy_ajp.c

+1 −4
Original line number Diff line number Diff line
@@ -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) {