Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 1 Nov 2003 22:29:42 -0000
Message-ID: <20031101222942.48254.qmail@minotaur.apache.org>
From: nd@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/server request.c

nd          2003/11/01 14:29:42

  Modified:    .        CHANGES
               server   request.c
  Log:
  Let mod_autoindex show filenames containing special chars like %.
  
  PR: 13598
  
  Revision  Changes    Path
  1.1305    +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1304
  retrieving revision 1.1305
  diff -u -u -r1.1304 -r1.1305
  --- CHANGES	1 Nov 2003 16:30:18 -0000	1.1304
  +++ CHANGES	1 Nov 2003 22:29:42 -0000	1.1305
  @@ -2,6 +2,9 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) mod_autoindex / core: Don't fail to show filenames containing
  +     special characters like '%'. PR 13598.  [Andr� Malo]
  +
     *) mod_info: HTML escape configuration information so it displays 
        correctly. PR 24232. [Thom May]
        
  
  
  
  1.130     +4 -1      httpd-2.0/server/request.c
  
  Index: request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/request.c,v
  retrieving revision 1.129
  retrieving revision 1.130
  diff -u -u -r1.129 -r1.130
  --- request.c	13 Oct 2003 23:43:00 -0000	1.129
  +++ request.c	1 Nov 2003 22:29:42 -0000	1.130
  @@ -1697,10 +1697,13 @@
               rnew->uri = ap_make_full_path(rnew->pool, rnew->uri, r->path_info + 1);
               rnew->path_info = apr_pstrdup(rnew->pool, r->path_info);
           }
  +        rnew->uri = ap_escape_uri(rnew->pool, rnew->uri);
       }
       else {
           udir = ap_make_dirstr_parent(rnew->pool, r->uri);
  -        rnew->uri = ap_make_full_path(rnew->pool, udir, dirent->name);
  +        rnew->uri = ap_escape_uri(rnew->pool, ap_make_full_path(rnew->pool,
  +                                                                udir,
  +                                                                dirent->name));
       }
   
       fdir = ap_make_dirstr_parent(rnew->pool, r->filename);