Commit d2f50aea authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

* Fix a regression with 2.2.31 that caused inherited workers to 

  use a different scoreboard slot then the original one.
  This has no trunk revision since this a 2.2.x issue only and trunk
  code is different.

PR: 58267
Reviewed by: rpluem, jkaluza, ylavic



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

CHANGES

+3 −1
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.2.32





  *) mod_proxy: Fix a regression with 2.2.31 that caused inherited workers to

     use a different scoreboard slot then the original one.  PR 58267.

     [Ruediger Pluem]



Changes with Apache 2.2.31

STATUS

+0 −9
Original line number Diff line number Diff line
@@ -112,15 +112,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
     2.2.x patch: http://people.apache.org/~sf/SSL_CTX_use_certificate_clear_errors.diff

     +1: sf, rpluem, ylavic



  *) mod_proxy: Fix a regression with 2.2.31 that caused inherited workers to

     use a different scoreboard slot then the original one.

     PR 58267

     Trunk version of patch:

        None, only 2.2.x specific

     Backport version for 2.2.x of patch:

        http://people.apache.org/~rpluem/patches/pr58267.diff

     +1: rpluem, jkaluza, ylavic





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

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

include/ap_mmn.h

+3 −1
Original line number Diff line number Diff line
@@ -158,6 +158,8 @@ 
 * 20051115.38 (2.2.30) Add ap_proxy_set_scoreboard_lb() in mod_proxy.h

 * 20051115.39 (2.2.30) Add ap_proxy_connection_reusable()

 * 20051115.40 (2.2.30) Add ap_map_http_request_error()

 * 20051115.41 (2.2.32) Add s member to proxy_server_conf struct and server

 *                      member to proxy_worker struct.

 */



#define MODULE_MAGIC_COOKIE 0x41503232UL /* "AP22" */
@@ -165,7 +167,7 @@ 
#ifndef MODULE_MAGIC_NUMBER_MAJOR

#define MODULE_MAGIC_NUMBER_MAJOR 20051115

#endif

#define MODULE_MAGIC_NUMBER_MINOR 40                    /* 0...n */

#define MODULE_MAGIC_NUMBER_MINOR 41                    /* 0...n */



/**

 * Determine if the server's current MODULE_MAGIC_NUMBER is at least a

modules/proxy/mod_proxy.c

+2 −0
Original line number Diff line number Diff line
@@ -1129,6 +1129,7 @@ static void * create_proxy_config(apr_pool_t *p, server_rec *s) 
    ps->badopt = bad_error;

    ps->badopt_set = 0;

    ps->pool = p;

    ps->s = s;



    return ps;

}
@@ -1172,6 +1173,7 @@ static void * merge_proxy_config(apr_pool_t *p, void *basev, void *overridesv) 
    ps->proxy_status = (overrides->proxy_status_set == 0) ? base->proxy_status : overrides->proxy_status;

    ps->proxy_status_set = overrides->proxy_status_set || base->proxy_status_set;

    ps->pool = p;

    ps->s = overrides->s;

    return ps;

}

modules/proxy/mod_proxy.h

+2 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ typedef struct { 
    } proxy_status;             /* Status display options */

    char proxy_status_set;

    apr_pool_t *pool;           /* Pool used for allocating this struct */

    server_rec *s;              /* The server_rec where this configuration was created in */

} proxy_server_conf;
@@ -369,6 +370,7 @@ struct proxy_worker { 
    char            disablereuse_set;

    apr_interval_time_t conn_timeout;

    char            conn_timeout_set;

    server_rec      *server;    /* The server_rec where this configuration was created in */

};



/*