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 a9ba13fd3b93084a117045b75e55e15481d4d3a4..d792d38443b3c68d496e67c46c67b1ab3f766397 100644 (file)
--- 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;
+                        }
                     }
                 }
             }