httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r527107 - in /httpd/httpd/branches/2.2.x: STATUS modules/proxy/mod_proxy_balancer.c
Date Tue, 10 Apr 2007 12:38:09 GMT
Author: jim
Date: Tue Apr 10 05:38:08 2007
New Revision: 527107

URL: http://svn.apache.org/viewvc?view=rev&rev=527107
Log:
Merge r484789 from trunk:

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


Modified:
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=527107&r1=527106&r2=527107
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue Apr 10 05:38:08 2007
@@ -77,20 +77,6 @@
 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:
 

Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c?view=diff&rev=527107&r1=527106&r2=527107
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c Tue Apr 10 05:38:08 2007
@@ -497,6 +497,8 @@
                                        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 @@
             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) {
@@ -520,6 +517,8 @@
     }
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                  "proxy_balancer_post_request for (%s)", balancer->name);
+
+#endif
 
     return OK;
 }



Mime
View raw message