Commit 5a020331 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

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

server/request.c

+18 −16
Original line number Diff line number Diff line
@@ -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,9 +1145,8 @@ minimerge: 
minimerge2:

                    this_dir = ap_get_module_config(htaccess_conf, &core_module);



                    if (!this_dir)

                        continue;



                    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)
@@ -1162,6 +1163,7 @@ minimerge2: 
                        }

                    }

                }

            }



            /* That temporary trailing slash was useful, now drop it.

             */