httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/server request.c
Date Sat, 29 Sep 2001 06:54:08 GMT
jerenkrantz    01/09/28 23:54:08

  Modified:    server   request.c
  Log:
  Fix for httpd-test modules/include test #17.
  
  If we are *already* a faux URI (i.e. relative file sub req) and we then
  make a subrequest from that faux URI to a file in the same directory,
  we'd try to build a URI out of the fake URI which leads to the wrong
  thing happening somewhere down the line.  So, let's just give this
  special case a fake URI as well.
  
  OtherBill needs to verify this.  He can back it out if he wants.  I
  don't much care.  It's one line and it seems okay...
  
  Revision  Changes    Path
  1.57      +2 -1      httpd-2.0/server/request.c
  
  Index: request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/request.c,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- request.c	2001/09/28 19:50:22	1.56
  +++ request.c	2001/09/29 06:54:08	1.57
  @@ -1747,7 +1747,8 @@
   
       if (strncmp(rnew->filename, fdir, fdirlen) == 0
              && rnew->filename[fdirlen] 
  -           && ap_strchr_c(rnew->filename + fdirlen, '/') == NULL) 
  +           && ap_strchr_c(rnew->filename + fdirlen, '/') == NULL
  +           && strlen(r->uri) != 0)
       {
           char *udir = ap_make_dirstr_parent(rnew->pool, r->uri);
   
  
  
  

Mime
View raw message