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

(-)httpd-2.0/modules/mappers/mod_rewrite.c (+23 lines)
Lines 1104-1109 Link Here
1104
static int hook_uri2file(request_rec *r)
1104
static int hook_uri2file(request_rec *r)
1105
{
1105
{
1106
    rewrite_server_conf *conf;
1106
    rewrite_server_conf *conf;
1107
    const char *saved_rulestatus;
1107
    const char *var;
1108
    const char *var;
1108
    const char *thisserver;
1109
    const char *thisserver;
1109
    char *thisport;
1110
    char *thisport;
Lines 1182-1187 Link Here
1182
                      thisurl, NULL);
1183
                      thisurl, NULL);
1183
    apr_table_setn(r->subprocess_env, ENVVAR_SCRIPT_URI, var);
1184
    apr_table_setn(r->subprocess_env, ENVVAR_SCRIPT_URI, var);
1185
    if (!(saved_rulestatus = apr_table_get(r->notes,"already_rewritten"))) {
1184
    /* if filename was not initially set,
1186
    /* if filename was not initially set,
1185
     * we start with the requested URI
1187
     * we start with the requested URI
1186
     */
1188
     */
Lines 1190-1200 Link Here
1190
        rewritelog(r, 2, "init rewrite engine with requested uri %s",
1192
        rewritelog(r, 2, "init rewrite engine with requested uri %s",
1191
                   r->filename);
1193
                   r->filename);
1192
    }
1194
    }
1195
    else {
1196
        rewritelog(r, 2, "init rewrite engine with passed filename %s."
1197
                   " Original uri = %s", r->filename, r->uri);
1198
    }
1193
    /*
1199
    /*
1194
     *  now apply the rules ...
1200
     *  now apply the rules ...
1195
     */
1201
     */
1196
    rulestatus = apply_rewrite_list(r, conf->rewriterules, NULL);
1202
    rulestatus = apply_rewrite_list(r, conf->rewriterules, NULL);
1203
    apr_table_set(r->notes,"already_rewritten",
1204
                  apr_psprintf(r->pool,"%d",rulestatus));
1205
    }
1206
    else {
1207
        rewritelog(r, 2,
1208
                   "uri already rewritten. Status %s, Uri %s, r->filename %s",
1209
                   saved_rulestatus, r->uri, r->filename);
1210
        rulestatus = atoi(saved_rulestatus);
1211
    }
1212
1197
    if (rulestatus) {
1213
    if (rulestatus) {
1198
        unsigned skip;
1214
        unsigned skip;
Lines 2816-2821 Link Here
2816
        }
2832
        }
2817
        else if (!strncasecmp(uri, "ntp://", 6)) {  /* nntp://   */
2833
        else if (!strncasecmp(uri, "ntp://", 6)) {  /* nntp://   */
2818
            return 7;
2834
            return 7;
2835
        }
2836
        break;
2837
2838
    case 'p':
2839
    case 'P':
2840
        if (!strncasecmp(uri, "roxy:", 5)) {       /* proxy:   */
2841
            return 6;
2819
        }
2842
        }
2820
        break;
2843
        break;
2821
    }
2844
    }

Return to bug 13946