httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r645807 - in /httpd/httpd/trunk/modules/proxy: mod_proxy.c proxy_util.c
Date Tue, 08 Apr 2008 09:26:06 GMT
Author: jim
Date: Tue Apr  8 02:25:57 2008
New Revision: 645807

URL: http://svn.apache.org/viewvc?rev=645807&view=rev
Log:
Use what we have. This logic belongs here anyway...

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy.c
    httpd/httpd/trunk/modules/proxy/proxy_util.c

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=645807&r1=645806&r2=645807&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Tue Apr  8 02:25:57 2008
@@ -1023,13 +1023,7 @@
         goto cleanup;
     }
 cleanup:
-    if (balancer) {
-        int post_status = proxy_run_post_request(worker, balancer, r, conf);
-        if (post_status == DECLINED) {
-            post_status = OK; /* no post_request handler available */
-            /* TODO: recycle direct worker */
-        }
-    }
+    ap_proxy_post_request(worker, balancer, r, conf);
 
     proxy_run_request_status(&access_status, r);
 

Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=645807&r1=645806&r2=645807&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Tue Apr  8 02:25:57 2008
@@ -1531,12 +1531,13 @@
                                          request_rec *r,
                                          proxy_server_conf *conf)
 {
-    int access_status;
+    int access_status = OK;
     if (balancer) {
         access_status = proxy_run_post_request(worker, balancer, r, conf);
-    }
-    else {
-        access_status = OK;
+        if (access_status == DECLINED) {
+            access_status = OK; /* no post_request handler available */
+            /* TODO: recycle direct worker */
+        }
     }
 
     return access_status;



Mime
View raw message