httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ryan Bloom <...@covalent.net>
Subject [PATCH] mod_include fix
Date Thu, 06 Sep 2001 16:29:07 GMT

Well, I finally made myself look at this and fix it.  This passed the httpd-test
cases now, and it looks correct to me.  I would like to apply this ASAP.

I dislike that we have to pstrdup the "" string, but we try to modify that string too
often to use a constant string.

Ryan

Index: server/request.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/request.c,v
retrieving revision 1.48
diff -u -d -b -w -u -r1.48 request.c
--- server/request.c	2001/09/01 05:21:16	1.48
+++ server/request.c	2001/09/06 16:21:33
@@ -1670,7 +1670,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.
Index: server/util.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/util.c,v
retrieving revision 1.112
diff -u -d -b -w -u -r1.112 util.c
--- server/util.c	2001/08/24 01:41:56	1.112
+++ server/util.c	2001/09/06 16:21:33
@@ -615,7 +619,7 @@
     int l;
 
     if (last_slash == NULL) {
-	return NULL;
+	return apr_pstrdup(p, "");
     }
     l = (last_slash - s) + 1;
     d = apr_palloc(p, l + 1);

______________________________________________________________
Ryan Bloom				rbb@apache.org
Covalent Technologies			rbb@covalent.net
--------------------------------------------------------------

Mime
View raw message