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

(-)request.c.orig (-15 / +9 lines)
Lines 101-107 Link Here
101
 */
101
 */
102
AP_DECLARE(int) ap_process_request_internal(request_rec *r)
102
AP_DECLARE(int) ap_process_request_internal(request_rec *r)
103
{
103
{
104
    int file_req = (r->main && r->filename);
105
    int access_status;
104
    int access_status;
106
105
107
    /* Ignore embedded %2F's in path for proxy requests */
106
    /* Ignore embedded %2F's in path for proxy requests */
Lines 133-148 Link Here
133
     * next several steps.  Only file subrequests are allowed an empty uri,
132
     * next several steps.  Only file subrequests are allowed an empty uri,
134
     * otherwise let translate_name kill the request.
133
     * otherwise let translate_name kill the request.
135
     */
134
     */
136
    if (!file_req) {
135
    if ((access_status = ap_location_walk(r))) {
137
        if ((access_status = ap_location_walk(r))) {
136
      return access_status;
138
            return access_status;
137
    }
139
        }
140
138
141
        if ((access_status = ap_run_translate_name(r))) {
139
    if ((access_status = ap_run_translate_name(r))) {
142
            return decl_die(access_status, "translate", r);
140
      return decl_die(access_status, "translate", r);
143
        }
144
    }
141
    }
145
142
143
146
    /* Reset to the server default config prior to running map_to_storage
144
    /* Reset to the server default config prior to running map_to_storage
147
     */
145
     */
148
    r->per_dir_config = r->server->lookup_defaults;
146
    r->per_dir_config = r->server->lookup_defaults;
Lines 152-165 Link Here
152
        return access_status;
150
        return access_status;
153
    }
151
    }
154
152
155
    /* Excluding file-specific requests with no 'true' URI...
153
    /* Rerun the location walk, which overrides any map_to_storage config.
156
     */
154
     */
157
    if (!file_req) {
155
    if ((access_status = ap_location_walk(r))) {
158
        /* Rerun the location walk, which overrides any map_to_storage config.
156
      return access_status;
159
         */
160
        if ((access_status = ap_location_walk(r))) {
161
            return access_status;
162
        }
163
    }
157
    }
164
158
165
    /* Only on the main request! */
159
    /* Only on the main request! */

Return to bug 41960