svn commit: r563468 - in /httpd/httpd/branches/2.2.x: STATUS server/core.c

[ji...@apache.org]

Author: jim
Date: Tue Aug  7 05:12:20 2007
New Revision: 563468

URL: http://svn.apache.org/viewvc?view=rev&rev=563468
Log:
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

Modified:
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/server/core.c

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=563468&r1=563467&r2=563468
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue Aug  7 05:12:20 2007
@@ -78,18 +78,6 @@
 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:
 

Modified: httpd/httpd/branches/2.2.x/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/core.c?view=diff&rev=563468&r1=563467&r2=563468
==============================================================================
--- httpd/httpd/branches/2.2.x/server/core.c (original)
+++ httpd/httpd/branches/2.2.x/server/core.c Tue Aug  7 05:12:20 2007
@@ -417,7 +417,7 @@
         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;
     }