Commit 795e46f1 authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

* 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
parent fb3ae42a

modules/proxy/mod_proxy_ftp.c

+5 −0
Changes for modules/proxy/mod_proxy_ftp.c: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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) {