httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/server request.c
Date Tue, 16 Oct 2001 02:19:42 GMT
wrowe       01/10/15 19:19:42

  Modified:    server   request.c
  Log:
    directory_walk trounced existing path_info declarations.  I suspect _this_
    was Greg Ames bug...
  
  Revision  Changes    Path
  1.73      +5 -1      httpd-2.0/server/request.c
  
  Index: request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/request.c,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- request.c	2001/10/16 02:15:45	1.72
  +++ request.c	2001/10/16 02:19:42	1.73
  @@ -543,7 +543,11 @@
           opts_remove = this_dir->opts_remove;
           override = this_dir->override;
   
  -        r->path_info = r->filename;
  +        /* XXX: Remerge path_info, or we are broken.  Needs more thought.
  +         */
  +        if (r->path_info)
  +            r->path_info = ap_make_full_path(r->pool, r->filename, 
  +                                                      r->path_info);
           rv = apr_filepath_root((const char **)&r->filename,
                                  (const char **)&r->path_info,
                                  APR_FILEPATH_TRUENAME, r->pool);
  
  
  

Mime
View raw message