From: Bill Stoddard <stoddard@apache.org>
Date: Sat, 28 Aug 1999 02:34:37 +0000 (+0000)
Subject: Fix merge bug
X-Git-Tag: 1.3.10~360
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd3555a284fad0a41a536be4335007f444bc89f5;p=apache

Fix merge bug


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83828 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/config.c b/server/config.c
index 823d34fc2f..a6864eca02 100644
--- a/server/config.c
+++ b/server/config.c
@@ -1119,6 +1119,7 @@ int ap_parse_htaccess(void **result, request_rec *r, int override,
                           "access to be safe");
             return HTTP_FORBIDDEN;
         }
+    }
 
 /* cache it */
     new = ap_palloc(r->pool, sizeof(struct htaccess_result));