]> granicus.if.org Git - apache/commitdiff
* Lock the worker, not the balancer. We even do not know if we have a balancer
authorRuediger Pluem <rpluem@apache.org>
Thu, 29 Aug 2019 11:30:56 +0000 (11:30 +0000)
committerRuediger Pluem <rpluem@apache.org>
Thu, 29 Aug 2019 11:30:56 +0000 (11:30 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1866067 13f79535-47bb-0310-9956-ffa450edef68

modules/proxy/mod_proxy_ftp.c

index 1199f35b9e41783dbe73cfb3759eb8af3605832b..f6f543ab3a1a3864cd0967bda7e2de88225d1ef0 100644 (file)
@@ -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