Commit 84d3eff0 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Fix a seg fault in mod_include. When we are generating an 

internal redirect, we must set r->uri to "", not a bogus
string, and not NULL.  [Ryan Bloom]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90929 13f79535-47bb-0310-9956-ffa450edef68
parent 3d57540c

CHANGES

+4 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.26-dev



  *) Fix a seg fault in mod_include.  When we are generating an

     internal redirect, we must set r->uri to "", not a bogus

     string, and not NULL.  [Ryan Bloom]



  *) Optimized location_walk, so subrequests, redirects and second passes

     now reuse previous section merges on a <Location > by <Location >

     basis, until we mismatch with the original location_walk.

server/request.c

+1 −1
Original line number Diff line number Diff line
@@ -1710,7 +1710,7 @@ AP_DECLARE(request_rec *) ap_sub_req_lookup_file(const char *new_file, 
         * but it's actually sometimes to impossible to do it... because the

         * file may not have a uri associated with it -djg

         */

        rnew->uri = "INTERNALLY GENERATED file-relative req";

        rnew->uri = apr_pstrdup(rnew->pool, "");



#if 0 /* XXX When this is reenabled, the cache triggers need to be set to faux

       * dir_walk/file_walk values.

server/util.c

+1 −1
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ AP_DECLARE(char *) ap_make_dirstr_parent(apr_pool_t *p, const char *s) 
    int l;



    if (last_slash == NULL) {

	return NULL;

	return apr_pstrdup(p, "");

    }

    l = (last_slash - s) + 1;

    d = apr_palloc(p, l + 1);