View | Details | Raw Unified | Return to bug 41960
Collapse All | Expand All

(-)- apache2/server/request.c (-7 / +4 lines)
Lines 152-165 Link Here
152
        return access_status;
152
        return access_status;
153
    }
153
    }
154
154
155
    /* Excluding file-specific requests with no 'true' URI...
155
    /* Rerun the location walk, which overrides any map_to_storage config.
156
     */
156
     */
157
    if (!file_req) {
157
    if ((access_status = ap_location_walk(r))) {
158
        /* Rerun the location walk, which overrides any map_to_storage config.
158
         return access_status;
159
         */
160
        if ((access_status = ap_location_walk(r))) {
161
            return access_status;
162
        }
163
    }
159
    }
164
160
165
    /* Only on the main request! */
161
    /* Only on the main request! */
Lines 615-620 Link Here
615
        opts.add = this_dir->opts_add;
611
        opts.add = this_dir->opts_add;
616
        opts.remove = this_dir->opts_remove;
612
        opts.remove = this_dir->opts_remove;
617
        opts.override = this_dir->override;
613
        opts.override = this_dir->override;
614
	opts.override_opts = this_dir->override_opts;
618
615
619
        /* Set aside path_info to merge back onto path_info later.
616
        /* Set aside path_info to merge back onto path_info later.
620
         * If r->filename is a directory, we must remerge the path_info,
617
         * If r->filename is a directory, we must remerge the path_info,

Return to bug 41960