SOURCES: apache-configdir_skip_backups.patch - readd missing (and ...

[arekm]

Author: arekm                        Date: Wed Dec 21 13:21:17 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- readd missing (and important) piece

---- Files affected:
SOURCES:
   apache-configdir_skip_backups.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/apache-configdir_skip_backups.patch
diff -u SOURCES/apache-configdir_skip_backups.patch:1.5 SOURCES/apache-configdir_skip_backups.patch:1.6
--- SOURCES/apache-configdir_skip_backups.patch:1.5	Fri Dec  2 11:58:04 2005
+++ SOURCES/apache-configdir_skip_backups.patch	Wed Dec 21 14:21:12 2005
@@ -1,6 +1,6 @@
-diff -Nru httpd-2.0.48.orig/server/config.c httpd-2.0.48/server/config.c
---- httpd-2.0.48.orig/server/config.c	2003-10-14 05:43:18.000000000 +0200
-+++ httpd-2.0.48/server/config.c	2003-10-28 10:09:44.618490512 +0100
+diff -ur httpd-2.2.0.org/server/config.c httpd-2.2.0/server/config.c
+--- httpd-2.2.0.org/server/config.c	2005-11-17 14:39:15.000000000 +0100
++++ httpd-2.2.0/server/config.c	2005-12-21 16:04:35.970963000 +0100
 @@ -1537,6 +1537,7 @@
          apr_dir_t *dirp;
          apr_finfo_t dirent;
@@ -9,9 +9,11 @@
          apr_array_header_t *candidates = NULL;
          fnames *fnew;
          char *path = apr_pstrdup(p, fname);
-@@ -1563,7 +1564,11 @@
+@@ -1562,8 +1563,13 @@
+ 
          candidates = apr_array_make(p, 1, sizeof(fnames));
          while (apr_dir_read(&dirent, APR_FINFO_DIRENT, dirp) == APR_SUCCESS) {
++	    slen = strlen(dirent.name);
              /* strip out '.' and '..' */
 -            if (strcmp(dirent.name, ".")
 +            if (strcmp(dirent.name, ".") && (dirent.name)[slen-1] != '~'
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/apache-configdir_skip_backups.patch?r1=1.5&r2=1.6&f=u