]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
mod_proxy: Follow up to r1918438: Don't cleanup conn before running the address cleanup.
authorYann Ylavic <ylavic@apache.org>
Wed, 19 Jun 2024 14:37:20 +0000 (14:37 +0000)
committerYann Ylavic <ylavic@apache.org>
Wed, 19 Jun 2024 14:37:20 +0000 (14:37 +0000)
* 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

modules/proxy/proxy_util.c

index 236af25f7f6030515823bdd47b38f67dbc1257ed..5dbc8b05a99c7c7343037a3f72c6522b6c212403 100644 (file)
@@ -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);
                 }
             }