updated to 2.0.42

Changed files:
    apache-configdir_skip_backups.patch -> 1.1.4.6

diff --git a/apache-configdir_skip_backups.patch b/apache-configdir_skip_backups.patch
index e2d49a34ce76e28142d9221b063b55950f24bcf9..558f6b33ddad6c113be97e52bcb02aed65681b5d 100644 (file)
--- a/apache-configdir_skip_backups.patch
+++ b/apache-configdir_skip_backups.patch
@@ -1,7 +1,6 @@
-diff -urN httpd-2.0.35.org/server/config.c httpd-2.0.35/server/config.c
---- httpd-2.0.35.org/server/config.c   Thu Apr 11 14:09:06 2002
-+++ httpd-2.0.35/server/config.c       Thu Apr 11 14:24:03 2002
-@@ -1427,6 +1427,7 @@
+--- httpd-2.0.42/server/config.c.wiget Thu Sep 12 22:04:07 2002
++++ httpd-2.0.42/server/config.c       Wed Sep 25 12:07:10 2002
+@@ -1458,6 +1458,7 @@
          apr_dir_t *dirp;
          apr_finfo_t dirent;
          int current;
@@ -9,26 +8,19 @@ diff -urN httpd-2.0.35.org/server/config.c httpd-2.0.35/server/config.c
          apr_array_header_t *candidates = NULL;
          fnames *fnew;
          apr_status_t rv;
-@@ -1448,11 +1449,19 @@
+@@ -1505,9 +1506,15 @@
  
          candidates = apr_array_make(p, 1, sizeof(fnames));
          while (apr_dir_read(&dirent, APR_FINFO_DIRENT, dirp) == APR_SUCCESS) {
-+          slen = strlen(dirent.name);
++              slen = strlen(dirent.name);
              /* strip out '.' and '..' */
              if (strcmp(dirent.name, ".")
--                && strcmp(dirent.name, "..")) {
--                fnew = (fnames *) apr_array_push(candidates);
--                fnew->fname = ap_make_full_path(p, fname, dirent.name);
-+                && strcmp(dirent.name, "..")
-+              && (dirent.name)[slen-1] != '~' && (dirent.name)[0] != '.') {
-+              if (slen < 8 || strcmp((dirent.name + slen - 7), ".rpmnew")) {
-+                  if (slen < 9 || 
-+                          strcmp((dirent.name + slen - 8), ".rpmorig") && 
-+                          strcmp((dirent.name + slen - 8), ".rpmsave")) {
-+                      fnew = (fnames *) apr_array_push(candidates);
-+                      fnew->fname = ap_make_full_path(p, fname, dirent.name);
-+                  }
-+              }
-             }
-         }
- 
+                 && 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")))
+                 && (!ispatt ||
+                     apr_fnmatch(pattern, dirent.name, 
+                                 FNM_PERIOD) == APR_SUCCESS)) {