You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by mi...@apache.org on 2010/03/01 23:19:33 UTC

svn commit: r917759 - /httpd/httpd/trunk/server/config.c

Author: minfrin
Date: Mon Mar  1 22:19:33 2010
New Revision: 917759

URL: http://svn.apache.org/viewvc?rev=917759&view=rev
Log:
Make sure we request the APR_FINFO_TYPE on the apr_dir_read() for wildcard
configuration.

Modified:
    httpd/httpd/trunk/server/config.c

Modified: httpd/httpd/trunk/server/config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/config.c?rev=917759&r1=917758&r2=917759&view=diff
==============================================================================
--- httpd/httpd/trunk/server/config.c (original)
+++ httpd/httpd/trunk/server/config.c Mon Mar  1 22:19:33 2010
@@ -1704,7 +1704,7 @@
     }
 
     candidates = apr_array_make(ptemp, 1, sizeof(fnames));
-    while (apr_dir_read(&dirent, APR_FINFO_DIRENT, dirp) == APR_SUCCESS) {
+    while (apr_dir_read(&dirent, APR_FINFO_DIRENT | APR_FINFO_TYPE, dirp) == APR_SUCCESS) {
         /* strip out '.' and '..' */
         if (strcmp(dirent.name, ".")
             && strcmp(dirent.name, "..")