From: Ruediger Pluem <rpluem@apache.org>
Date: Tue, 22 Jul 2008 13:43:24 +0000 (+0000)
Subject: * Ensure that the SSL filters are not inserted on FTP data connections even
X-Git-Tag: 2.3.0~416
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aab8e406ce1f91779fa40860f1ac5a1b59f7fbca;p=apache

* Ensure that the SSL filters are not inserted on FTP data connections even
  if the virtual host that causes the proxy request has SSL enabled.


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

diff --git a/modules/proxy/mod_proxy_ftp.c b/modules/proxy/mod_proxy_ftp.c
index 90906bc456..a23ccdf476 100644
--- a/modules/proxy/mod_proxy_ftp.c
+++ b/modules/proxy/mod_proxy_ftp.c
@@ -1777,6 +1777,11 @@ static int proxy_ftp_handler(request_rec *r, proxy_worker *worker,
         return HTTP_INTERNAL_SERVER_ERROR;
     }
 
+    /*
+     * We do not do SSL over the data connection, even if the virtual host we
+     * are in might have SSL enabled
+     */
+    ap_proxy_ssl_disable(data);
     /* set up the connection filters */
     rc = ap_run_pre_connection(data, data_sock);
     if (rc != OK && rc != DONE) {