httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r239646 - in /httpd/httpd/branches/2.0.x: STATUS modules/proxy/proxy_ftp.c
Date Wed, 24 Aug 2005 12:50:02 GMT
Author: jim
Date: Wed Aug 24 05:50:00 2005
New Revision: 239646

URL: http://svn.apache.org/viewcvs?rev=239646&view=rev
Log:
Fold in other's patch. Had enough votes and closes PR 34512
for 2.0 tree.

Modified:
    httpd/httpd/branches/2.0.x/STATUS
    httpd/httpd/branches/2.0.x/modules/proxy/proxy_ftp.c

Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/STATUS?rev=239646&r1=239645&r2=239646&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Wed Aug 24 05:50:00 2005
@@ -195,12 +195,6 @@
       Votes from before the integration branch:
           +1: jerenkrantz, wrowe (trivial, would even be cool in 1.3)
 
-     *) proxy FTP: Fix confusion about globbing characters which could lead
-        to getting a directory listing when a file was requested.  PR 34512.
-        2.1 patch was http://svn.apache.org/viewcvs?rev=179704&view=rev
-        2.0 version: http://people.apache.org/~trawick/179704-20.txt
-        +1: trawick, jorton, wrowe
-
      *) Add httxt2dbm for creating RewriteMap DBM Files.
         http://svn.apache.org/viewcvs.cgi?rev=209539&view=rev
         +1: pquerna, jorton, trawick

Modified: httpd/httpd/branches/2.0.x/modules/proxy/proxy_ftp.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/proxy/proxy_ftp.c?rev=239646&r1=239645&r2=239646&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/proxy/proxy_ftp.c (original)
+++ httpd/httpd/branches/2.0.x/modules/proxy/proxy_ftp.c Wed Aug 24 05:50:00 2005
@@ -92,7 +92,7 @@
     for ( ; *path; ++path) {
         if (*path == '\\')
 	    ++path;
-        if (path != '\0' && strchr(FTP_GLOBBING_CHARS, *path) != NULL)
+        if (*path != '\0' && strchr(FTP_GLOBBING_CHARS, *path) != NULL)
             return TRUE;
     }
     return FALSE;



Mime
View raw message