From: William A. Rowe Jr <wrowe@apache.org>
Date: Sat, 6 Oct 2001 22:47:20 +0000 (+0000)
Subject:   Hmmm... continue's not so good an idea here :)
X-Git-Tag: 2.0.26~84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=526abd74c0f46e4300a546e16ba9718ab8a1e590;p=thirdparty%2Fapache%2Fhttpd.git

  Hmmm... continue's not so good an idea here :)


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

diff --git a/server/request.c b/server/request.c
index a9ba13fd3b9..d792d38443b 100644
--- a/server/request.c
+++ b/server/request.c
@@ -415,6 +415,8 @@ static int resolve_symlink(char *d, apr_finfo_t *lfi, int opts, apr_pool_t *p)
     return OK;
 }
 
+/* #define REPLACE_PATH_INFO_METHOD
+ */
 #ifndef REPLACE_PATH_INFO_METHOD
 
 static int check_symlinks(char *d, int opts, apr_pool_t *p)
@@ -1143,22 +1145,22 @@ minimerge:
 minimerge2:
                     this_dir = ap_get_module_config(htaccess_conf, &core_module);
 
-                    if (!this_dir)
-                        continue;
-
-                    if (this_dir->opts & OPT_UNSET) {
-	                opts_add = (opts_add & ~this_dir->opts_remove) | this_dir->opts_add;
-	                opts_remove = (opts_remove & ~this_dir->opts_add)
-	                            | this_dir->opts_remove;
-	                opts = (opts & ~opts_remove) | opts_add;
-                    }
-                    else {
-	                opts = this_dir->opts;
-	                opts_add = this_dir->opts_add;
-	                opts_remove = this_dir->opts_remove;
-                    }
-                    if (!(this_dir->override & OR_UNSET)) {
-                        override = this_dir->override;
+                    if (this_dir) 
+                    {
+                        if (this_dir->opts & OPT_UNSET) {
+	                    opts_add = (opts_add & ~this_dir->opts_remove) | this_dir->opts_add;
+	                    opts_remove = (opts_remove & ~this_dir->opts_add)
+	                                | this_dir->opts_remove;
+	                    opts = (opts & ~opts_remove) | opts_add;
+                        }
+                        else {
+	                    opts = this_dir->opts;
+	                    opts_add = this_dir->opts_add;
+	                    opts_remove = this_dir->opts_remove;
+                        }
+                        if (!(this_dir->override & OR_UNSET)) {
+                            override = this_dir->override;
+                        }
                     }
                 }
             }