Commit 1dc13b93 authored by Christophe Jaillet's avatar Christophe Jaillet
Browse files

Merge r1611979, r1611725, r1588448, r1642803, r1657949, r1451108 (part of it), 

r1643672, r1496178 from trunk

   * Synch with trunk:
        - Add missing APLOGNO.
        - mod_deflate: don't require <limits.h> by using APR_INT32_MAX instead of INT_MAX.
        - Move two variable assignments off the fast path.
        - Fix curly braces style. Remove useless empty lines
        - tab vs space
        - Removed tabs.
        - dump fcgi headers with trace8 instead of debug+compile-time flag.
        - Drop severity of "LDAP: Setting referrals to ON" from DEBUG to TRACE4

Submitted by: jailletc36, ylavic, minfrin, fuankg, covener
Reviewed by: jailletc36, minfrin, ylavic
Backported by: jailletc36

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

STATUS

+0 −20
Changes for STATUS: 0 added lines, 20 removed lines.
Original line number Diff line number Diff line
@@ -119,26 +119,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
     2.4.x patch: trunks works (modulo CHANGES)

     +1: ylavic, rjung, jailletc36



   * Easy patches - synch with trunk

        - Add missing APLOGNO.

        - mod_deflate: don't require <limits.h> by using APR_INT32_MAX instead of INT_MAX.

        - Move two variable assignments off the fast path.

        - Fix curly braces style. Remove useless empty lines

        - tab vs space

        - Removed tabs.

        - dump fcgi headers with trace8 instead of debug+compile-time flag.

        - Drop severity of "LDAP: Setting referrals to ON" from DEBUG to TRACE4

     trunk patch:

        http://svn.apache.org/r1611979

        http://svn.apache.org/r1611725

        http://svn.apache.org/r1588448

        http://svn.apache.org/r1642803

        http://svn.apache.org/r1657949

        http://svn.apache.org/r1451108 (only one part still has to be applied. Done manually)

        http://svn.apache.org/r1496178

     2.4.x patch: http://people.apache.org/~jailletc36/backport11-v2.patch

     +1: jailletc36, minfrin, ylavic





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

modules/filters/mod_deflate.c

+6 −8
Changes for modules/filters/mod_deflate.c: 6 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ 


#include "zlib.h"



#include <limits.h>     /* for INT_MAX */



static const char deflateFilterName[] = "DEFLATE";

module AP_MODULE_DECLARE_DATA deflate_module;
@@ -934,8 +932,8 @@ static apr_status_t deflate_out_filter(ap_filter_t *f, 
            apr_bucket_delete(e);

            continue;

        }

        if (len > INT_MAX) {

            apr_bucket_split(e, INT_MAX);

        if (len > APR_INT32_MAX) {

            apr_bucket_split(e, APR_INT32_MAX);

            apr_bucket_read(e, &data, &len, APR_BLOCK_READ);

        }
@@ -1308,8 +1306,8 @@ static apr_status_t deflate_in_filter(ap_filter_t *f, 
            if (!len) {

                continue;

            }

            if (len > INT_MAX) {

                apr_bucket_split(bkt, INT_MAX);

            if (len > APR_INT32_MAX) {

                apr_bucket_split(bkt, APR_INT32_MAX);

                apr_bucket_read(bkt, &data, &len, APR_BLOCK_READ);

            }
@@ -1694,8 +1692,8 @@ static apr_status_t inflate_out_filter(ap_filter_t *f, 
            apr_bucket_delete(e);

            continue;

        }

        if (len > INT_MAX) {

            apr_bucket_split(e, INT_MAX);

        if (len > APR_INT32_MAX) {

            apr_bucket_split(e, APR_INT32_MAX);

            apr_bucket_read(e, &data, &len, APR_BLOCK_READ);

        }

modules/http/http_filters.c

+1 −1
Changes for modules/http/http_filters.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ static apr_status_t read_chunked_trailers(http_ctx_t *ctx, ap_filter_t *f, 
    else {

        const char *error_notes = apr_table_get(r->notes,

                                                "error-notes");

        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, 

        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(02656)

                      "Error while reading HTTP trailer: %i%s%s",

                      r->status, error_notes ? ": " : "",

                      error_notes ? error_notes : "");

modules/ldap/util_ldap.c

+1 −1
Changes for modules/ldap/util_ldap.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ static int uldap_connection_init(request_rec *r, 


    if (ldc->ChaseReferrals != AP_LDAP_CHASEREFERRALS_SDKDEFAULT) {

        /* Set options for rebind and referrals. */

        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, APLOGNO(01278)

        ap_log_error(APLOG_MARK, APLOG_TRACE4, 0, r->server, APLOGNO(01278)

                "LDAP: Setting referrals to %s.",

                ((ldc->ChaseReferrals == AP_LDAP_CHASEREFERRALS_ON) ? "On" : "Off"));

        apr_ldap_set_option(r->pool, ldc->ldap,

modules/proxy/balancers/mod_lbmethod_bybusyness.c

+4 −5
Changes for modules/proxy/balancers/mod_lbmethod_bybusyness.c: 4 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ static int (*ap_proxy_retry_worker_fn)(const char *proxy_function, 
static proxy_worker *find_best_bybusyness(proxy_balancer *balancer,

                                request_rec *r)

{



    int i;

    proxy_worker **worker;

    proxy_worker *mycandidate = NULL;
@@ -116,11 +115,11 @@ static proxy_worker *find_best_bybusyness(proxy_balancer *balancer, 
    }



    return mycandidate;



}



/* assumed to be mutex protected by caller */

static apr_status_t reset(proxy_balancer *balancer, server_rec *s) {

static apr_status_t reset(proxy_balancer *balancer, server_rec *s)

{

    int i;

    proxy_worker **worker;

    worker = (proxy_worker **)balancer->workers->elts;
@@ -131,7 +130,8 @@ static apr_status_t reset(proxy_balancer *balancer, server_rec *s) { 
    return APR_SUCCESS;

}



static apr_status_t age(proxy_balancer *balancer, server_rec *s) {

static apr_status_t age(proxy_balancer *balancer, server_rec *s)

{

    return APR_SUCCESS;

}
@@ -144,7 +144,6 @@ static const proxy_balancer_method bybusyness = 
    &age

};





static void register_hook(apr_pool_t *p)

{

    ap_register_provider(p, PROXY_LBMETHOD, "bybusyness", "0", &bybusyness);