httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r678761 - /httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c
Date Tue, 22 Jul 2008 13:43:24 GMT
Author: rpluem
Date: Tue Jul 22 06:43:24 2008
New Revision: 678761

URL: http://svn.apache.org/viewvc?rev=678761&view=rev
Log:
* 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.

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=678761&r1=678760&r2=678761&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c Tue Jul 22 06:43:24 2008
@@ -1777,6 +1777,11 @@
         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) {



Mime
View raw message