diff options
| author | Christophe Jaillet <jailletc36@apache.org> | 2015-08-31 21:49:32 +0200 |
|---|---|---|
| committer | Christophe Jaillet <jailletc36@apache.org> | 2015-08-31 21:49:32 +0200 |
| commit | c449c94f281c3ada3cd190d7a0a8b6b42a1534a0 (patch) | |
| tree | 664ffe2a366901bd0aafe29201108a52b896f6b7 /server/request.c | |
| parent | Silence a sparse warning about inconsistent indenting (diff) | |
| download | apache2-c449c94f281c3ada3cd190d7a0a8b6b42a1534a0.tar.xz apache2-c449c94f281c3ada3cd190d7a0a8b6b42a1534a0.zip | |
Silence a sparse warning about inconsistent indenting
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700319 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/request.c')
| -rw-r--r-- | server/request.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/server/request.c b/server/request.c index fc6443992b..67e535d14c 100644 --- a/server/request.c +++ b/server/request.c @@ -572,10 +572,9 @@ static void core_opts_merge(const ap_conf_vector_t *sec, core_opts_t *opts) opts->override_opts = this_dir->override_opts; } - if (this_dir->override_list != NULL) { + if (this_dir->override_list != NULL) { opts->override_list = this_dir->override_list; - } - + } } @@ -618,7 +617,7 @@ AP_DECLARE(int) ap_directory_walk(request_rec *r) ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(00029) "Module bug? Request filename is missing for URI %s", r->uri); - return OK; + return OK; } /* Canonicalize the file path without resolving filename case or aliases |