From: Martin Kraemer <martin@apache.org>
Date: Mon, 4 Feb 2002 10:11:29 +0000 (+0000)
Subject: Oops. Use ftp_check_globbingchars().
X-Git-Tag: 2.0.32~105
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34e0d8cf5dd4d88c260f735bdb0df82ccd81b463;p=thirdparty%2Fapache%2Fhttpd.git

Oops. Use ftp_check_globbingchars().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93217 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index b2d86d28a23..488988dab96 100644
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -363,16 +363,9 @@ apr_status_t ap_proxy_send_dir_filter(ap_filter_t *f, apr_bucket_brigade *in)
             ++path;
 
         reldir = strrchr(path, '/');
-        if (reldir != NULL) {
-            for (n=0; reldir[n] != '\0'; ++n) {
-                if (reldir[n] == '\\' && reldir[n+1] != '\0')
-                    ++n; /* escaped character */
-                else if (strchr(FTP_GLOBBING_CHARS, reldir[n]) != NULL) {
-                    wildcard = &reldir[1];
-                    reldir[0] = '\0'; /* strip off the wildcard suffix */
-                    break;
-                }
-            }
+        if (reldir != NULL && ftp_check_globbingchars(reldir)) {
+            wildcard = &reldir[1];
+            reldir[0] = '\0'; /* strip off the wildcard suffix */
         }
 
         /* Copy path, strip (all except the last) trailing slashes */