* 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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@562860 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/core.c b/server/core.c
index ea7b14afb3e72b7337e943012756c977d86efb7e..2131cf95ee351ab8b46fc692a6e01ff42430fc44 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -389,7 +389,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;
     }