Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 6 Sep 2001 17:58:28 -0000
Message-ID: <20010906175828.18296.qmail@icarus.apache.org>
From: rbb@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/server request.c util.c

rbb         01/09/06 10:58:28

  Modified:    .        CHANGES
               server   request.c util.c
  Log:
  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]
  
  Revision  Changes    Path
  1.357     +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.356
  retrieving revision 1.357
  diff -u -r1.356 -r1.357
  --- CHANGES	2001/09/06 16:52:14	1.356
  +++ CHANGES	2001/09/06 17:58:27	1.357
  @@ -1,5 +1,9 @@
   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. 
  
  
  
  1.50      +1 -1      httpd-2.0/server/request.c
  
  Index: request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/request.c,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- request.c	2001/09/06 16:48:15	1.49
  +++ request.c	2001/09/06 17:58:28	1.50
  @@ -1710,7 +1710,7 @@
            * 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.
  
  
  
  1.113     +1 -1      httpd-2.0/server/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/util.c,v
  retrieving revision 1.112
  retrieving revision 1.113
  diff -u -r1.112 -r1.113
  --- util.c	2001/08/24 01:41:56	1.112
  +++ util.c	2001/09/06 17:58:28	1.113
  @@ -615,7 +615,7 @@
       int l;
   
       if (last_slash == NULL) {
  -	return NULL;
  +	return apr_pstrdup(p, "");
       }
       l = (last_slash - s) + 1;
       d = apr_palloc(p, l + 1);