diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2001-08-06 19:13:02 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2001-08-06 19:13:02 +0000 |
| commit | ff7a816bf5608172d49e8cb0a19dc9f5c4cdd130 (patch) | |
| tree | 31c956d521331330241002cd27e5f91313ecca39 | |
| parent | 5835764fc86fb023e19c474a0525babeb8eb892b (diff) | |
| download | httpd-ff7a816bf5608172d49e8cb0a19dc9f5c4cdd130.tar.gz | |
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
| -rw-r--r-- | modules/http/http_request.c | 2 | ||||
| -rw-r--r-- | modules/mappers/mod_negotiation.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/modules/http/http_request.c b/modules/http/http_request.c index 487d0928ad..a278cd7d87 100644 --- 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 3684937be8..e4ff05c7bc 100644 --- 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! */ |