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

  _THIS_ is why mod_dir wouldn't serve the results of mod_negotiation
  with a query string


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89948 13f79535-47bb-0310-9956-ffa450edef68
parent 4231d1d6

include/http_request.h

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ AP_DECLARE(void) ap_internal_redirect_handler(const char *new_uri, request_rec * 
 * @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

modules/http/http_request.c

+5 −2
Original line number Diff line number Diff line
@@ -556,7 +556,8 @@ static request_rec *internal_internal_redirect(const char *new_uri, 
    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 @@ AP_DECLARE(void) ap_internal_fast_redirect(request_rec *rr, request_rec *r)) 
     * 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;