From: Jim Jagielski <jim@apache.org>
Date: Fri, 15 Aug 2008 22:09:10 +0000 (+0000)
Subject: Merge r678761 from trunk:
X-Git-Tag: 2.2.10~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e958340f3b539472ba2251197e2b01ed9fafa7eb;p=thirdparty%2Fapache%2Fhttpd.git

Merge r678761 from trunk:

* 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.

Submitted by: rpluem
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@686393 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index dcf27c72d62..591463c6aae 100644
--- a/STATUS
+++ b/STATUS
@@ -111,15 +111,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
         Trunk version of patch works
      +1: jorton, trawick, rpluem
 
- * mod_proxy_ftp: 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.
-    Trunk version of patch:
-       http://svn.apache.org/viewvc?view=rev&revision=678761
-    Backport version for 2.2.x of patch:
-       Trunk version of patch works
-    +1: rpluem, mturk, jim
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
diff --git a/modules/proxy/mod_proxy_ftp.c b/modules/proxy/mod_proxy_ftp.c
index aca1cc40eaa..d9a3f51a494 100644
--- a/modules/proxy/mod_proxy_ftp.c
+++ b/modules/proxy/mod_proxy_ftp.c
@@ -1778,6 +1778,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) {