From 87b579e2b019f616173397d2c61d9bfcc66fb415 Mon Sep 17 00:00:00 2001
From: "William A. Rowe Jr" <wrowe@apache.org>
Date: Mon, 8 Jul 2002 17:43:34 +0000
Subject: [PATCH]   Changes for deprecated apr_is_fnmatch

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95976 13f79535-47bb-0310-9956-ffa450edef68
---
 modules/generators/mod_autoindex.c | 2 +-
 modules/proxy/mod_proxy.c          | 2 +-
 modules/ssl/ssl_engine_init.c      | 2 +-
 server/core.c                      | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index aa5e143b29..ce6f294301 100644
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -307,7 +307,7 @@ static const char *add_desc(cmd_parms *cmd, void *d, const char *desc,
     desc_entry->full_path = (ap_strchr_c(to, '/') == NULL) ? 0 : 1;
     desc_entry->wildcards = (WILDCARDS_REQUIRED
                              || desc_entry->full_path
-                             || apr_is_fnmatch(to));
+                             || apr_fnmatch_test(to));
     if (desc_entry->wildcards) {
         prefix = desc_entry->full_path ? "*/" : "*";
         desc_entry->pattern = apr_pstrcat(dcfg->desc_list->pool,
diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index dfd7391bdf..27e6ca58d2 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -986,7 +986,7 @@ static const char *proxysection(cmd_parms *cmd, void *mconfig, const char *arg)
 
     conf->r = r;
     conf->p = cmd->path;
-    conf->p_is_fnmatch = apr_is_fnmatch(conf->p);
+    conf->p_is_fnmatch = apr_fnmatch_test(conf->p);
 
     ap_add_per_proxy_conf(cmd->server, new_dir_conf);
 
diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index 2203210db7..bf63baf4c1 100644
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -857,7 +857,7 @@ static void ssl_check_public_cert(server_rec *s,
     if (SSL_X509_getCN(ptemp, cert, &cn)) {
         int fnm_flags = FNM_PERIOD|FNM_CASE_BLIND;
 
-        if (apr_is_fnmatch(cn) &&
+        if (apr_fnmatch_test(cn) &&
             (apr_fnmatch(cn, s->server_hostname,
                          fnm_flags) == FNM_NOMATCH))
         {
diff --git a/server/core.c b/server/core.c
index d9acc24bea..bff8cb4ad2 100644
--- a/server/core.c
+++ b/server/core.c
@@ -1628,7 +1628,7 @@ static const char *dirsection(cmd_parms *cmd, void *mconfig, const char *arg)
 
     conf->r = r;
     conf->d = cmd->path;
-    conf->d_is_fnmatch = (apr_is_fnmatch(conf->d) != 0);
+    conf->d_is_fnmatch = (apr_fnmatch_test(conf->d) != 0);
 
     /* Make this explicit - the "/" root has 0 elements, that is, we
      * will always merge it, and it will always sort and merge first.
@@ -1694,7 +1694,7 @@ static const char *urlsection(cmd_parms *cmd, void *mconfig, const char *arg)
         return errmsg;
 
     conf->d = apr_pstrdup(cmd->pool, cmd->path);     /* No mangling, please */
-    conf->d_is_fnmatch = apr_is_fnmatch(conf->d) != 0;
+    conf->d_is_fnmatch = apr_fnmatch_test(conf->d) != 0;
     conf->r = r;
 
     ap_add_per_url_conf(cmd->server, new_url_conf);
@@ -1766,7 +1766,7 @@ static const char *filesection(cmd_parms *cmd, void *mconfig, const char *arg)
         return errmsg;
 
     conf->d = cmd->path;
-    conf->d_is_fnmatch = apr_is_fnmatch(conf->d) != 0;
+    conf->d_is_fnmatch = apr_fnmatch_test(conf->d) != 0;
     conf->r = r;
 
     ap_add_file_conf(c, new_file_conf);
-- 
2.40.0