X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=apache-configdir_skip_backups.patch;h=a0ff92e1cf322e33c669449e62b9cab931e9425d;hb=b77f3be89fbc13b7aa04dfc574702f5a15971d51;hp=d51ec9416feeaffb5c13f7be1a74b05259c760ef;hpb=1708c0e6f217b5b36c01bb4b84024b1f42ae1523;p=packages%2Fapache.git

diff --git a/apache-configdir_skip_backups.patch b/apache-configdir_skip_backups.patch
index d51ec94..a0ff92e 100644
--- a/apache-configdir_skip_backups.patch
+++ b/apache-configdir_skip_backups.patch
@@ -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 @@ diff -Nru httpd-2.0.48.orig/server/config.c httpd-2.0.48/server/config.c
          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] != '~'