Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 54851 invoked from network); 8 Jan 2004 20:41:04 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 8 Jan 2004 20:41:04 -0000 Received: (qmail 56788 invoked by uid 500); 8 Jan 2004 20:40:47 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 56753 invoked by uid 500); 8 Jan 2004 20:40:47 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 56529 invoked by uid 500); 8 Jan 2004 20:40:41 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 56212 invoked from network); 8 Jan 2004 20:40:36 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 8 Jan 2004 20:40:36 -0000 Received: (qmail 54093 invoked by uid 1078); 8 Jan 2004 20:40:46 -0000 Date: 8 Jan 2004 20:40:46 -0000 Message-ID: <20040108204046.54092.qmail@minotaur.apache.org> From: jim@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/server config.c request.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jim 2004/01/08 12:40:46 Modified: modules/generators Tag: APACHE_2_0_BRANCH mod_autoindex.c modules/ssl Tag: APACHE_2_0_BRANCH ssl_engine_init.c server Tag: APACHE_2_0_BRANCH config.c request.c Log: If using apr_fnmatch() we should be using it's macros Revision Changes Path No revision No revision 1.112.2.11 +3 -3 httpd-2.0/modules/generators/mod_autoindex.c Index: mod_autoindex.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/generators/mod_autoindex.c,v retrieving revision 1.112.2.10 retrieving revision 1.112.2.11 diff -u -r1.112.2.10 -r1.112.2.11 --- mod_autoindex.c 1 Jan 2004 13:30:39 -0000 1.112.2.10 +++ mod_autoindex.c 8 Jan 2004 20:40:45 -0000 1.112.2.11 @@ -812,7 +812,7 @@ */ #ifdef CASE_BLIND_FILESYSTEM -#define MATCH_FLAGS FNM_CASE_BLIND +#define MATCH_FLAGS APR_FNM_CASE_BLIND #else #define MATCH_FLAGS 0 #endif @@ -1298,7 +1298,7 @@ #ifndef CASE_BLIND_FILESYSTEM if (pattern && (apr_fnmatch(pattern, dirent->name, - FNM_NOESCAPE | FNM_PERIOD) + APR_FNM_NOESCAPE | APR_FNM_PERIOD) != APR_SUCCESS)) return (NULL); #else /* !CASE_BLIND_FILESYSTEM */ @@ -1308,7 +1308,7 @@ * reliably - so we have to granularise at the OS level. */ if (pattern && (apr_fnmatch(pattern, dirent->name, - FNM_NOESCAPE | FNM_PERIOD | FNM_CASE_BLIND) + APR_FNM_NOESCAPE | APR_FNM_PERIOD | APR_FNM_CASE_BLIND) != APR_SUCCESS)) return (NULL); #endif /* !CASE_BLIND_FILESYSTEM */ No revision No revision 1.106.2.8 +2 -2 httpd-2.0/modules/ssl/ssl_engine_init.c Index: ssl_engine_init.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_init.c,v retrieving revision 1.106.2.7 retrieving revision 1.106.2.8 diff -u -r1.106.2.7 -r1.106.2.8 --- ssl_engine_init.c 1 Jan 2004 13:30:41 -0000 1.106.2.7 +++ ssl_engine_init.c 8 Jan 2004 20:40:46 -0000 1.106.2.8 @@ -855,11 +855,11 @@ } if (SSL_X509_getCN(ptemp, cert, &cn)) { - int fnm_flags = FNM_PERIOD|FNM_CASE_BLIND; + int fnm_flags = APR_FNM_PERIOD|APR_FNM_CASE_BLIND; if (apr_fnmatch_test(cn) && (apr_fnmatch(cn, s->server_hostname, - fnm_flags) == FNM_NOMATCH)) + fnm_flags) == APR_FNM_NOMATCH)) { ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, "%s server certificate wildcard CommonName (CN) `%s' " No revision No revision 1.156.2.9 +1 -1 httpd-2.0/server/config.c Index: config.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/config.c,v retrieving revision 1.156.2.8 retrieving revision 1.156.2.9 diff -u -r1.156.2.8 -r1.156.2.9 --- config.c 1 Jan 2004 13:30:43 -0000 1.156.2.8 +++ config.c 8 Jan 2004 20:40:46 -0000 1.156.2.9 @@ -1611,7 +1611,7 @@ if (strcmp(dirent.name, ".") && strcmp(dirent.name, "..") && (apr_fnmatch(pattern, dirent.name, - FNM_PERIOD) == APR_SUCCESS)) { + APR_FNM_PERIOD) == APR_SUCCESS)) { fnew = (fnames *) apr_array_push(candidates); fnew->fname = ap_make_full_path(p, path, dirent.name); } 1.121.2.10 +3 -3 httpd-2.0/server/request.c Index: request.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/request.c,v retrieving revision 1.121.2.9 retrieving revision 1.121.2.10 diff -u -r1.121.2.9 -r1.121.2.10 --- request.c 1 Jan 2004 13:30:43 -0000 1.121.2.9 +++ request.c 8 Jan 2004 20:40:46 -0000 1.121.2.10 @@ -806,7 +806,7 @@ && ((entry_core->d_components < seg) || (entry_core->d_is_fnmatch ? (apr_fnmatch(entry_core->d, r->filename, - FNM_PATHNAME) != APR_SUCCESS) + APR_FNM_PATHNAME) != APR_SUCCESS) : (strcmp(r->filename, entry_core->d) != 0)))) { continue; } @@ -1273,7 +1273,7 @@ if (entry_core->r ? ap_regexec(entry_core->r, r->uri, 0, NULL, 0) : (entry_core->d_is_fnmatch - ? apr_fnmatch(entry_core->d, cache->cached, FNM_PATHNAME) + ? apr_fnmatch(entry_core->d, cache->cached, APR_FNM_PATHNAME) : (strncmp(entry_core->d, cache->cached, len) || (entry_core->d[len - 1] != '/' && cache->cached[len] != '/' @@ -1422,7 +1422,7 @@ if (entry_core->r ? ap_regexec(entry_core->r, cache->cached , 0, NULL, 0) : (entry_core->d_is_fnmatch - ? apr_fnmatch(entry_core->d, cache->cached, FNM_PATHNAME) + ? apr_fnmatch(entry_core->d, cache->cached, APR_FNM_PATHNAME) : strcmp(entry_core->d, cache->cached))) { continue; }