From: Ruediger Pluem <rpluem@apache.org>
Date: Thu, 29 Aug 2019 11:30:56 +0000 (+0000)
Subject: * Lock the worker, not the balancer. We even do not know if we have a balancer
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1909
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d83542320dfe54cf11456b921e0ee93fb6a340d;p=thirdparty%2Fapache%2Fhttpd.git

* Lock the worker, not the balancer. We even do not know if we have a balancer

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

diff --git a/modules/proxy/mod_proxy_ftp.c b/modules/proxy/mod_proxy_ftp.c
index 1199f35b9e4..f6f543ab3a1 100644
--- a/modules/proxy/mod_proxy_ftp.c
+++ b/modules/proxy/mod_proxy_ftp.c
@@ -1123,7 +1123,7 @@ static int proxy_ftp_handler(request_rec *r, proxy_worker *worker,
     if (worker->s->is_address_reusable) {
         if (!worker->cp->addr) {
 #if APR_HAS_THREADS
-            if ((err = PROXY_THREAD_LOCK(worker->balancer)) != APR_SUCCESS) {
+            if ((err = PROXY_THREAD_LOCK(worker)) != APR_SUCCESS) {
                 ap_log_rerror(APLOG_MARK, APLOG_ERR, err, r, APLOGNO(01037) "lock");
                 return HTTP_INTERNAL_SERVER_ERROR;
             }
@@ -1144,7 +1144,7 @@ static int proxy_ftp_handler(request_rec *r, proxy_worker *worker,
     if (worker->s->is_address_reusable && !worker->cp->addr) {
         worker->cp->addr = connect_addr;
 #if APR_HAS_THREADS
-        if ((uerr = PROXY_THREAD_UNLOCK(worker->balancer)) != APR_SUCCESS) {
+        if ((uerr = PROXY_THREAD_UNLOCK(worker)) != APR_SUCCESS) {
             ap_log_rerror(APLOG_MARK, APLOG_ERR, uerr, r, APLOGNO(01038) "unlock");
         }
 #endif