summaryrefslogtreecommitdiffstats
path: root/server/config.c
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2003-09-03 21:27:12 +0200
committerJeff Trawick <trawick@apache.org>2003-09-03 21:27:12 +0200
commitaa21671e13767135f0ee3f88d6a3ff6d039e6534 (patch)
tree4076c4ce92c1c44bd68937d2550b470462fb4892 /server/config.c
parentPoint to the correct download location. (diff)
downloadapache2-aa21671e13767135f0ee3f88d6a3ff6d039e6534.tar.xz
apache2-aa21671e13767135f0ee3f88d6a3ff6d039e6534.zip
switch to APR 1.0 API (which is still in flux)
because of the changes to the argument lists of apr_mmap_dup and apr_socket_create, 2.1-dev won't build with apr and apr-util's 0.9 branch anymore git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101154 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/config.c')
-rw-r--r--server/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/config.c b/server/config.c
index 86daeeb666..9a8a728533 100644
--- a/server/config.c
+++ b/server/config.c
@@ -1549,7 +1549,7 @@ AP_DECLARE(void) ap_process_resource_config(server_rec *s, const char *fname,
&& !(strcmp(fname, ap_server_root_relative(p, SERVER_CONFIG_FILE)))) {
apr_finfo_t finfo;
- if (apr_lstat(&finfo, fname, APR_FINFO_TYPE, p) != APR_SUCCESS)
+ if (apr_stat(&finfo, fname, APR_FINFO_LINK | APR_FINFO_TYPE, p) != APR_SUCCESS)
return;
}
@@ -1608,7 +1608,7 @@ AP_DECLARE(void) ap_process_resource_config(server_rec *s, const char *fname,
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);
}