SOURCES: apache-configdir_skip_backups.patch - updated

[arekm]

Author: arekm                        Date: Fri Dec  2 10:58:09 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

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

---- Diffs:

================================================================
Index: SOURCES/apache-configdir_skip_backups.patch
diff -u SOURCES/apache-configdir_skip_backups.patch:1.4 SOURCES/apache-configdir_skip_backups.patch:1.5
--- SOURCES/apache-configdir_skip_backups.patch:1.4	Tue Oct 28 10:22:20 2003
+++ SOURCES/apache-configdir_skip_backups.patch	Fri Dec  2 11:58:04 2005
@@ -1,26 +1,24 @@
 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
-@@ -1458,6 +1458,7 @@
+@@ -1537,6 +1537,7 @@
          apr_dir_t *dirp;
          apr_finfo_t dirent;
          int current;
 +	size_t slen;
          apr_array_header_t *candidates = NULL;
          fnames *fnew;
-         apr_status_t rv;
-@@ -1478,8 +1479,14 @@
- 
+         char *path = apr_pstrdup(p, fname);
+@@ -1563,7 +1564,11 @@
          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, ".")
-+		&& (dirent.name)[slen-1] != '~'
-+		&& (dirent.name)[0] != '.'
-+		&& (slen < 8 || strcmp((dirent.name + slen - 7), ".rpmnew"))
-+		&& (slen < 9 || ( strcmp((dirent.name + slen - 8), ".rpmorig")
-+				&& strcmp((dirent.name + slen - 8), ".rpmsave")))
+-            if (strcmp(dirent.name, ".")
++            if (strcmp(dirent.name, ".") && (dirent.name)[slen-1] != '~'
++			    && (dirent.name)[0] != '.'
++			    && (slen < 8 || strcmp((dirent.name + slen - 7), ".rpmnew"))
++			    && (slen < 9 || ( strcmp((dirent.name + slen - 8), ".rpmorig")
++					    && strcmp((dirent.name + slen - 8), ".rpmsave")))
                  && strcmp(dirent.name, "..")) {
                  fnew = (fnames *) apr_array_push(candidates);
                  fnew->fname = ap_make_full_path(p, path, dirent.name);
================================================================

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