From: Jim Jagielski <jim@apache.org>
Date: Tue, 8 Apr 2008 09:25:57 +0000 (+0000)
Subject: Use what we have. This logic belongs here anyway...
X-Git-Tag: 2.3.0~775
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3cb64b009a7636d04c812218d9a25fb35d54b4d4;p=apache

Use what we have. This logic belongs here anyway...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645807 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 54e8a72749..67b91a88c0 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -1023,13 +1023,7 @@ static int proxy_handler(request_rec *r)
         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);
 
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 607ca98169..b1d0c918a5 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1531,12 +1531,13 @@ PROXY_DECLARE(int) ap_proxy_post_request(proxy_worker *worker,
                                          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;