You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2001/08/06 21:10:12 UTC
cvs commit: httpd-2.0/include http_request.h
wrowe 01/08/06 12:10:12
Modified: modules/http http_request.c
include http_request.h
Log:
_THIS_ is why mod_dir wouldn't serve the results of mod_negotiation
with a query string
Revision Changes Path
1.104 +5 -2 httpd-2.0/modules/http/http_request.c
Index: http_request.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/http/http_request.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- http_request.c 2001/08/06 19:03:37 1.103
+++ http_request.c 2001/08/06 19:10:12 1.104
@@ -556,7 +556,8 @@
return new;
}
-AP_DECLARE(void) ap_internal_fast_redirect(request_rec *rr, request_rec *r))
+/* XXX: Is this function is so bogus and fragile that we deep-6 it? */
+AP_DECLARE(void) ap_internal_fast_redirect(request_rec *rr, request_rec *r)
{
/* We need to tell POOL_DEBUG that we're guaranteeing that rr->pool
* will exist as long as r->pool. Otherwise we run into troubles because
@@ -564,7 +565,9 @@
* rr->pool.
*/
apr_pool_join(r->pool, rr->pool);
- r->mtime = 0; /* reset etag info for subrequest */
+ r->mtime = rr->mtime; /* reset etag info for subrequest */
+ r->uri = rr->uri;
+ r->args = rr->args;
r->filename = rr->filename;
r->handler = rr->handler;
r->content_type = rr->content_type;
1.33 +1 -1 httpd-2.0/include/http_request.h
Index: http_request.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/http_request.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- http_request.h 2001/08/06 19:03:37 1.32
+++ http_request.h 2001/08/06 19:10:12 1.33
@@ -207,7 +207,7 @@
* @tip the sub_req's pool will be merged into r's pool, be very careful
* not to destroy this subrequest, it will be destroyed with the main request!
*/
-AP_DECLARE(void) ap_internal_fast_redirect(request_rec *sub_req, request_rec *r))
+AP_DECLARE(void) ap_internal_fast_redirect(request_rec *sub_req, request_rec *r);
/**
* Can be used within any handler to determine if any authentication