From: Mladen Turk <mturk@apache.org>
Date: Sat, 1 Jan 2005 16:04:25 +0000 (+0000)
Subject: Fix closing connection for non-cachable proxies.
X-Git-Tag: 2.1.3~210
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55230b229bcd5128e9b829127e1ab0ae4143f0ba;p=thirdparty%2Fapache%2Fhttpd.git

Fix closing connection for non-cachable proxies.
Do not close the entire connection, just socket if
opened.

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

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 78dfc5c08c8..fda9ccd459d 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1665,9 +1665,9 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r,
         !worker->is_address_reusable) {
         /* TODO: Check if the connection can be reused
          */
-        if (conn->connection) {
-            conn->close = 1;
-            ap_proxy_release_connection("*", conn, r->server);
+        if (conn->sock) {
+            apr_socket_close(conn->sock);
+            conn->sock = NULL;
         }
         err = apr_sockaddr_info_get(&(conn->addr),
                                     conn->hostname, APR_UNSPEC,