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

diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index 487d0928ad6393d930ede8412719b888d1595f6f..a278cd7d87164f811645d6a47a9d51e50daf3dc6 100644 (file)
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -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;

diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c
index 3684937be8e57c800fe88fe0c34ac9f3cac6e628..e4ff05c7bca7dd0f1ff3580decd1ca998b96fa1e 100644 (file)
--- a/modules/mappers/mod_negotiation.c
+++ b/modules/mappers/mod_negotiation.c
@@ -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!
      */