--- request.c.orig Fri Nov 21 13:28:16 2008 +++ request.c.orig Fri Nov 21 14:11:21 2008 @@ -564,12 +564,17 @@ * we must merge our dir_conf_merged onto this new r->per_dir_config. */ if (r->per_dir_config == cache->per_dir_result) { - return OK; + ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, + "Skipping r->per_dir_config == cache->per_dir_result cache hit for" + " filename %s uri %s", r->filename, r->uri); + /* return OK; */ } - - if (r->per_dir_config == cache->dir_conf_merged) { - r->per_dir_config = cache->per_dir_result; - return OK; + else if (r->per_dir_config == cache->dir_conf_merged) { + ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, + "Skipping r->per_dir_config == cache->dir_conf_merged cache hit for" + " filename %s uri %s", r->filename, r->uri); + /* r->per_dir_config = cache->per_dir_result; + return OK; */ } if (cache->walked->nelts) { @@ -577,7 +582,7 @@ [cache->walked->nelts - 1].merged; } } - else { +/* else */ { /* We start now_merged from NULL since we want to build * a locations list that can be merged to any vhost. */