httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r562860 - /httpd/httpd/trunk/server/core.c
Date Sun, 05 Aug 2007 12:47:45 GMT
Author: rpluem
Date: Sun Aug  5 05:47:44 2007
New Revision: 562860

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

Modified:
    httpd/httpd/trunk/server/core.c

Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?view=diff&rev=562860&r1=562859&r2=562860
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Sun Aug  5 05:47:44 2007
@@ -389,7 +389,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;
     }



Mime
View raw message