From: William A. Rowe Jr <wrowe@apache.org>
Date: Sun, 7 Oct 2001 04:54:53 +0000 (+0000)
Subject:   Great badness - not a good idea to return OK when you don't modify the
X-Git-Tag: 2.0.26~83
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a933f4d949a797d5bed0b170cf2f0de707218183;p=thirdparty%2Fapache%2Fhttpd.git

  Great badness - not a good idea to return OK when you don't modify the
  resulting value, even if it's NULL.


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

diff --git a/server/config.c b/server/config.c
index 4258f31bcd0..291d129ee07 100644
--- a/server/config.c
+++ b/server/config.c
@@ -1475,9 +1475,8 @@ AP_CORE_DECLARE(int) ap_parse_htaccess(ap_conf_vector_t **result,
     /* firstly, search cache */
     for (cache = r->htaccess; cache != NULL; cache = cache->next)
 	if (cache->override == override && strcmp(cache->dir, d) == 0) {
-	    if (cache->htaccess != NULL)
-		*result = cache->htaccess;
-	    return OK;
+	    *result = cache->htaccess;
+            return OK;
 	}
 
     parms = default_parms;