You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by gr...@apache.org on 2002/02/04 22:19:08 UTC

cvs commit: httpd-2.0/modules/generators mod_autoindex.c

gregames    02/02/04 13:19:08

  Modified:    modules/generators mod_autoindex.c
  Log:
  vetoing and backing out OtherBill's patch rev 1.91.  This breaks
  mod_autoindex on systems such as Unix where apr_dir_read doesn't automatically
  return the filetype.  You see a '?' icon rather than a folder icon
  for directories on 2.0.31 because mod_autoindex doesn't realize that the thing
  is a directory.
  
  No, we don't want more stat()s either.
  
  Revision  Changes    Path
  1.93      +2 -2      httpd-2.0/modules/generators/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_autoindex.c,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- mod_autoindex.c	27 Jan 2002 07:44:07 -0000	1.92
  +++ mod_autoindex.c	4 Feb 2002 21:19:08 -0000	1.93
  @@ -1298,7 +1298,7 @@
       }
   
       p = (struct ent *) apr_pcalloc(r->pool, sizeof(struct ent));
  -    if (dirent->filetype == APR_DIR) {
  +    if (rr->finfo.filetype == APR_DIR) {
           p->name = apr_pstrcat(r->pool, dirent->name, "/", NULL);
       }
       else {
  @@ -1316,7 +1316,7 @@
   
       if (autoindex_opts & (FANCY_INDEXING | TABLE_INDEXING)) {
           p->lm = rr->finfo.mtime;
  -        if (dirent->filetype == APR_DIR) {
  +        if (rr->finfo.filetype == APR_DIR) {
               if (autoindex_opts & FOLDERS_FIRST) {
                   p->isdir = 1;
               }