Commit b25cd20c authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Fold in other's patch. Had enough votes and closes PR 34512 

for 2.0 tree.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@239646 13f79535-47bb-0310-9956-ffa450edef68
parent 241da10d

STATUS

+0 −6
Changes for STATUS: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -195,12 +195,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
      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

modules/proxy/proxy_ftp.c

+1 −1
Changes for modules/proxy/proxy_ftp.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static int ftp_check_globbingchars(const char *path) 
    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;