Commit c131e68d authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Remove the ->mtime reset back to negotiation, who decided to do this.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89949 13f79535-47bb-0310-9956-ffa450edef68
parent 2ca9a4c0

modules/http/http_request.c

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ AP_DECLARE(void) ap_internal_fast_redirect(request_rec *rr, request_rec *r) 
     * rr->pool.

     */

    apr_pool_join(r->pool, rr->pool);

    r->mtime = rr->mtime; /* reset etag info for subrequest */

    r->mtime = rr->mtime;

    r->uri = rr->uri;

    r->args = rr->args;

    r->filename = rr->filename;

modules/mappers/mod_negotiation.c

+6 −0
Original line number Diff line number Diff line
@@ -2703,6 +2703,12 @@ static int handle_multi(request_rec *r) 
    /* now do a "fast redirect" ... promotes the sub_req into the main req */

    ap_internal_fast_redirect(sub_req, r);



    /* give no advise for time on this subrequest.  Perhaps we

     * should tally the last mtime amoung all variants, and date

     * the most recent, but that could confuse the proxies.

     */

    r->mtime = 0;

    

    /* clean up all but our favorite variant, since that sub_req

     * is now merged into the main request!

     */