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

(-)request.c.orig (-6 / +11 lines)
Lines 564-575 Link Here
564
         * we must merge our dir_conf_merged onto this new r->per_dir_config.
564
         * we must merge our dir_conf_merged onto this new r->per_dir_config.
565
         */
565
         */
566
        if (r->per_dir_config == cache->per_dir_result) {
566
        if (r->per_dir_config == cache->per_dir_result) {
567
            return OK;
567
            ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r,
568
                      "Skipping r->per_dir_config == cache->per_dir_result cache hit for"
569
                      " filename %s uri %s", r->filename, r->uri);
570
            /* return OK; */
568
        }
571
        }
569
572
        else if (r->per_dir_config == cache->dir_conf_merged) {
570
        if (r->per_dir_config == cache->dir_conf_merged) {
573
            ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r,
571
            r->per_dir_config = cache->per_dir_result;
574
                      "Skipping r->per_dir_config == cache->dir_conf_merged cache hit for"
572
            return OK;
575
                      " filename %s uri %s", r->filename, r->uri);
576
            /* r->per_dir_config = cache->per_dir_result;
577
            return OK; */
573
        }
578
        }
574
579
575
        if (cache->walked->nelts) {
580
        if (cache->walked->nelts) {
Lines 577-583 Link Here
577
                [cache->walked->nelts - 1].merged;
582
                [cache->walked->nelts - 1].merged;
578
        }
583
        }
579
    }
584
    }
580
    else {
585
/*    else */ {
581
        /* We start now_merged from NULL since we want to build
586
        /* We start now_merged from NULL since we want to build
582
         * a locations list that can be merged to any vhost.
587
         * a locations list that can be merged to any vhost.
583
         */
588
         */

Return to bug 45959