1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00

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
This commit is contained in:
William A. Rowe Jr
2001-08-06 19:13:02 +00:00
parent 5835764fc8
commit ff7a816bf5
2 changed files with 7 additions and 1 deletions

View File

@@ -565,7 +565,7 @@ AP_DECLARE(void) ap_internal_fast_redirect(request_rec *rr, request_rec *r)
* rr->pool. * rr->pool.
*/ */
apr_pool_join(r->pool, 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->uri = rr->uri;
r->args = rr->args; r->args = rr->args;
r->filename = rr->filename; r->filename = rr->filename;

View File

@@ -2703,6 +2703,12 @@ static int handle_multi(request_rec *r)
/* now do a "fast redirect" ... promotes the sub_req into the main req */ /* now do a "fast redirect" ... promotes the sub_req into the main req */
ap_internal_fast_redirect(sub_req, r); 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 /* clean up all but our favorite variant, since that sub_req
* is now merged into the main request! * is now merged into the main request!
*/ */