Commit 57ef5071 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r484789 from trunk: 

We are doing nothing here... but keep the stubs
in case we ever do.



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

STATUS

+0 −14
Original line number Diff line number Diff line
@@ -77,20 +77,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



   * mod_proxy_balancer: Remove unnecessary lock/unlock for

     the post_request hook. We are actually doing nothing here.

     But keep the code (but macroed out) for future usage.

     Trunk version of patch:

       http://svn.apache.org/viewvc?view=rev&revision=484789

       http://svn.apache.org/viewvc?view=rev&revision=484794

     2.2.x version of patch:

       Trunk version works.

     +1: jim, mturk, rpluem

         rpluem says: Shouldn't we remove this code on 2.2.x? Keeping seems to

         be ok for me on trunk, but on a stable branch?

         jim says: the reason why we keep it is in case we

         ever start using it. So we keep the framework in

         that case. Make trunk backports easier.



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

modules/proxy/mod_proxy_balancer.c

+5 −6
Original line number Diff line number Diff line
@@ -497,6 +497,8 @@ static int proxy_balancer_post_request(proxy_worker *worker, 
                                       request_rec *r,

                                       proxy_server_conf *conf)

{



#if 0

    apr_status_t rv;



    if ((rv = PROXY_THREAD_LOCK(balancer)) != APR_SUCCESS) {
@@ -505,12 +507,7 @@ static int proxy_balancer_post_request(proxy_worker *worker, 
            balancer->name);

        return HTTP_INTERNAL_SERVER_ERROR;

    }

    /* TODO: calculate the bytes transferred

     * This will enable to elect the worker that has

     * the lowest load.

     * The bytes transferred depends on the protocol

     * used, so each protocol handler should keep the

     * track on that.

    /* TODO: placeholder for post_request actions

     */



    if ((rv = PROXY_THREAD_UNLOCK(balancer)) != APR_SUCCESS) {
@@ -521,6 +518,8 @@ static int proxy_balancer_post_request(proxy_worker *worker, 
    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,

                 "proxy_balancer_post_request for (%s)", balancer->name);



#endif



    return OK;

}