Merge r562860 from trunk:

* Avoid that relative changes to Options change the settings for FileETag.
  This does NOT address the remaining issues with relative settings and
  FileETag mentioned in PR 42027, but at least it isolates the problem
  to them. Currently these issues can be worked around with absolute
  settings.

PR: 42027
Submitted by: Rici Lake <rici ricilake.net>
Reviewed by: rpluem

Submitted by: rpluem
Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@563468 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 94eb7a8e2ee98c00008495b2eb60d2a0657f19d4..a205a59e6e0418da67b5abcdf73776db895178ef 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -78,18 +78,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * mod_core: Avoid that relative changes to Options change the settings for
-      FileETag. This does NOT address the remaining issues with relative
-      settings and FileETag mentioned in PR 42027, but at least it isolates the
-      problem to them. Hence there is no CHANGES entry yet. Fixing the other
-      issues needs some time and thought. Currently these issues can be worked
-      around with absolute settings.
-      PR: 42027
-      Trunk version of patch:
-         http://svn.apache.org/viewcvs.cgi?rev=562860&view=rev
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works
-      +1: rpluem, niq, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 

diff --git a/server/core.c b/server/core.c
index 69cd3dcbb8cee98140f44abf44683031c77fe512..b4aca33b409bf0ea83c167c2618ae08532b9f536 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -417,7 +417,7 @@ static void *merge_core_dir_configs(apr_pool_t *a, void *basev, void *newv)
         conf->etag_add =
             (conf->etag_add & (~ new->etag_remove)) | new->etag_add;
         conf->etag_remove =
-            (conf->opts_remove & (~ new->etag_add)) | new->etag_remove;
+            (conf->etag_remove & (~ new->etag_add)) | new->etag_remove;
         conf->etag_bits =
             (conf->etag_bits & (~ conf->etag_remove)) | conf->etag_add;
     }