From: Christophe Jaillet <jailletc36@apache.org>
Date: Mon, 31 Aug 2015 19:49:32 +0000 (+0000)
Subject: Silence a sparse warning about inconsistent indenting
X-Git-Tag: 2.5.0-alpha~2896
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c449c94f281c3ada3cd190d7a0a8b6b42a1534a0;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/server/request.c b/server/request.c
index fc6443992b9..67e535d14c5 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