From: Yann Ylavic <ylavic@apache.org>
Date: Wed, 19 Jun 2024 14:37:20 +0000 (+0000)
Subject: mod_proxy: Follow up to r1918438: Don't cleanup conn before running the address cleanup.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e90af7e9e38ae7f9b46f4023275d6c64ffc57592;p=thirdparty%2Fapache%2Fhttpd.git

mod_proxy: Follow up to r1918438: Don't cleanup conn before running the address cleanup.

* modules/proxy/proxy_util.c(ap_proxy_determine_address):
  Move conn_cleanup() after apr_pool_cleanup_run().



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

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 236af25f7f6..5dbc8b05a99 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -3061,11 +3061,11 @@ PROXY_DECLARE(apr_status_t) ap_proxy_determine_address(const char *proxy_functio
                                               apr_pool_cleanup_null);
                 }
                 else {
+                    apr_pool_cleanup_run(conn->pool, conn->address,
+                                         proxy_address_cleanup);
                     if (!keep_conn_alive) {
                         conn_cleanup(conn);
                     }
-                    apr_pool_cleanup_run(conn->pool, conn->address,
-                                         proxy_address_cleanup);
                 }
             }