httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/modules/generators mod_autoindex.c
Date Thu, 26 Aug 2004 13:01:21 GMT
jorton      2004/08/26 06:01:21

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS Makefile.in
               modules/generators Tag: APACHE_2_0_BRANCH mod_autoindex.c
  Log:
  Backport from HEAD:
  
  * Makefile.in: Link httpd against user-supplied $(LIBS).
  
  * modules/standard/mod_autoindex.c (index_directory): If stat() fails
  for a particular dirent, ignore that entry rather than truncating the
  directory listing.
  
  PR: 7882, 17357
  Reviewed by: stoddard, trawick
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.332 +8 -1      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.331
  retrieving revision 1.988.2.332
  diff -d -w -u -r1.988.2.331 -r1.988.2.332
  --- CHANGES	26 Aug 2004 01:03:22 -0000	1.988.2.331
  +++ CHANGES	26 Aug 2004 13:01:16 -0000	1.988.2.332
  @@ -1,5 +1,12 @@
   Changes with Apache 2.0.51
   
  +  *) mod_autoindex: Don't truncate the directory listing if a stat()
  +     call fails (for instance on a >2Gb file).  PR 17357.
  +     [Joe Orton]
  +
  +  *) Makefile fix: httpd is linked against LIBS given to the
  +     'make' invocation.  PR 7882.  [Joe Orton]
  +
     *) WinNT MPM: Fix a broken log message at termination.  PR 28063.
        [Eider Oliveira <eider bol.com.br>]
   
  @@ -76,7 +83,7 @@
        This makes the cache work on Linux again. [Graham Leggett]
   
     *) Enable special ErrorDocument value 'default' which restores the
  -     canned server response for the scope of the directive
  +     canned server response for the scope of the directive.
        [Geoffrey Young, Andre Malo]
   
     *) work around MSIE Digest auth bug - if AuthDigestEnableQueryStringHack
  
  
  
  1.751.2.1009 +1 -12     httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.1008
  retrieving revision 1.751.2.1009
  diff -d -w -u -r1.751.2.1008 -r1.751.2.1009
  --- STATUS	26 Aug 2004 12:12:00 -0000	1.751.2.1008
  +++ STATUS	26 Aug 2004 13:01:17 -0000	1.751.2.1009
  @@ -94,17 +94,6 @@
          PR: 30134
          +1: jorton, trawick
   
  -    *) Build fix: ensure httpd is linked against user-supplied LIBS during make.
  -       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/Makefile.in?r1=1.138&r2=1.139
  -       PR: 7882
  -       +1: jorton, stoddard, trawick
  -
  -    *) mod_autoindex: Don't truncate directory listing when a stat call fails.
  -       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/generators/mod_autoindex.c?r1=1.132&r2=1.133
  -       PR: 17357
  -       +1: jorton, stoddard (stat fails when file size > 2GB even if
  -           large file support is enabled), trawick
  -
       *) unixd_accept: Eliminate now-unnecessary apr_os_sock_get() call.
          http://cvs.apache.org/viewcvs.cgi/httpd-2.0/os/unix/unixd.c?r1=1.66&r2=1.67
          +1: jorton, trawick
  
  
  
  1.127.2.4 +1 -1      httpd-2.0/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.in,v
  retrieving revision 1.127.2.3
  retrieving revision 1.127.2.4
  diff -d -w -u -r1.127.2.3 -r1.127.2.4
  --- Makefile.in	27 Dec 2003 12:00:42 -0000	1.127.2.3
  +++ Makefile.in	26 Aug 2004 13:01:18 -0000	1.127.2.4
  @@ -4,7 +4,7 @@
   
   PROGRAM_NAME         = $(progname)
   PROGRAM_SOURCES      = modules.c
  -PROGRAM_LDADD        = $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
  +PROGRAM_LDADD        = $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
$(LIBS)
   PROGRAM_DEPENDENCIES = \
     $(BUILTIN_LIBS) \
     $(MPM_LIB) \
  
  
  
  No                   revision
  No                   revision
  1.112.2.16 +12 -3     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.112.2.15
  retrieving revision 1.112.2.16
  diff -d -w -u -r1.112.2.15 -r1.112.2.16
  --- mod_autoindex.c	9 Feb 2004 20:53:17 -0000	1.112.2.15
  +++ mod_autoindex.c	26 Aug 2004 13:01:21 -0000	1.112.2.16
  @@ -2098,8 +2098,16 @@
       fullpath = apr_palloc(r->pool, APR_PATH_MAX);
       dirpathlen = strlen(name);
       memcpy(fullpath, name, dirpathlen);
  -    while (apr_dir_read(&dirent, APR_FINFO_MIN | APR_FINFO_NAME,
  -                        thedir) == APR_SUCCESS) {
  +
  +    do {
  +        status = apr_dir_read(&dirent, APR_FINFO_MIN | APR_FINFO_NAME, thedir);
  +        if (APR_STATUS_IS_INCOMPLETE(status)) {
  +            continue; /* ignore un-stat()able files */
  +        }
  +        else if (status != APR_SUCCESS) {
  +            break;
  +        }
  +
           /* We want to explode symlinks here. */
           if (dirent.filetype == APR_LNK) {
               const char *savename;
  @@ -2125,7 +2133,8 @@
               head = p;
               num_ent++;
           }
  -    }
  +    } while (1);
  +
       if (num_ent > 0) {
           ar = (struct ent **) apr_palloc(r->pool,
                                           num_ent * sizeof(struct ent *));
  
  
  

Mime
View raw message