You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2019/08/29 11:30:56 UTC

svn commit: r1866067 - /httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c

Author: rpluem
Date: Thu Aug 29 11:30:56 2019
New Revision: 1866067

URL: http://svn.apache.org/viewvc?rev=1866067&view=rev
Log:
* Lock the worker, not the balancer. We even do not know if we have a balancer

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c?rev=1866067&r1=1866066&r2=1866067&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c Thu Aug 29 11:30:56 2019
@@ -1123,7 +1123,7 @@ static int proxy_ftp_handler(request_rec
     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
     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