httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r686393 - in /httpd/httpd/branches/2.2.x: ./ STATUS docs/ modules/proxy/mod_proxy_ftp.c support/ab.c support/suexec.c
Date Fri, 15 Aug 2008 22:09:11 GMT
Author: jim
Date: Fri Aug 15 15:09:10 2008
New Revision: 686393

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

Modified:
    httpd/httpd/branches/2.2.x/   (props changed)
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/docs/   (props changed)
    httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ftp.c
    httpd/httpd/branches/2.2.x/support/ab.c   (props changed)
    httpd/httpd/branches/2.2.x/support/suexec.c   (props changed)

Propchange: httpd/httpd/branches/2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 15 15:09:10 2008
@@ -1 +1 @@
-/httpd/httpd/trunk:682369
+/httpd/httpd/trunk:678761,682369

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=686393&r1=686392&r2=686393&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Aug 15 15:09:10 2008
@@ -111,15 +111,6 @@
         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 ]
 

Propchange: httpd/httpd/branches/2.2.x/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 15 15:09:10 2008
@@ -1 +1 @@
-/httpd/httpd/trunk/docs:675610,682369
+/httpd/httpd/trunk/docs:675610,678761,682369

Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ftp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ftp.c?rev=686393&r1=686392&r2=686393&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ftp.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ftp.c Fri Aug 15 15:09:10 2008
@@ -1778,6 +1778,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) {

Propchange: httpd/httpd/branches/2.2.x/support/ab.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 15 15:09:10 2008
@@ -1 +1 @@
-/httpd/httpd/trunk/support/ab.c:83751-655654,657433,682369
+/httpd/httpd/trunk/support/ab.c:83751-655654,657433,678761,682369

Propchange: httpd/httpd/branches/2.2.x/support/suexec.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 15 15:09:10 2008
@@ -1 +1 @@
-/httpd/httpd/trunk/support/suexec.c:655711,682369
+/httpd/httpd/trunk/support/suexec.c:655711,678761,682369



Mime
View raw message