diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2002-04-22 17:33:28 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2002-04-22 17:33:28 +0000 |
| commit | ab67ee44565487eb43b99b90f1b9ecebebce9f50 (patch) | |
| tree | fb9a5f9cd50ba540ddd80ecc0f4489a5394e521a /server/request.c | |
| parent | 0468e9b273c1e8c0e037f7b4cb1c0b7216db883b (diff) | |
| download | httpd-ab67ee44565487eb43b99b90f1b9ecebebce9f50.tar.gz | |
Fix this optimization. We will skip along so long as we aren't at the
right number of components, -or- we mismatch on the current component.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94757 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/request.c')
| -rw-r--r-- | server/request.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/server/request.c b/server/request.c index b871877ae5..f00d044c04 100644 --- a/server/request.c +++ b/server/request.c @@ -764,11 +764,11 @@ AP_DECLARE(int) ap_directory_walk(request_rec *r) * Otherwise, skip over the mismatches. */ if (entry_core->d_components - && (entry_core->d_components < seg) - && (entry_core->d_is_fnmatch - ? (apr_fnmatch(entry_core->d, r->filename, - FNM_PATHNAME) != APR_SUCCESS) - : (strcmp(r->filename, entry_core->d) != 0))) { + && ((entry_core->d_components < seg) + || (entry_core->d_is_fnmatch + ? (apr_fnmatch(entry_core->d, r->filename, + FNM_PATHNAME) != APR_SUCCESS) + : (strcmp(r->filename, entry_core->d) != 0)))) { continue; } |