svn commit: r1389261 - in /httpd/httpd/branches/2.4.x: ./ CHANGES docs/conf/httpd.conf.in

[ji...@apache.org]

Author: jim
Date: Mon Sep 24 09:43:45 2012
New Revision: 1389261

URL: http://svn.apache.org/viewvc?rev=1389261&view=rev
Log:
Merge r1386913, r1388825 from trunk:

Revert r1371878 --  default configuration changes that drop the DNT
header from IE10.

See:
  Message-ID: <CA...@mail.gmail.com>
  PR 53845



Keep this in, but commented out: also provide a little
more background/rationale. This, hopefully, satisfies both
ends of the debate: we don't "assume" that everyone who
uses this browser didn't make the specific choice, but
we allow for admins who care about DNT and want to either
  1. Make a statement
  2. Force adherence to the standard
to easily do so.
Submitted by: covener, jim
Reviewed/backported by: jim

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/docs/conf/httpd.conf.in

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1386913,1388825

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1389261&r1=1389260&r2=1389261&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Sep 24 09:43:45 2012
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.4.4
 
+  *) httpd.conf: Removed the configuration directives setting a bad_DNT
+     environment introduced in 2.4.3. The actual directives are commented
+     out in the default conf file.
+
   *) core: Apply length limit when logging Status header values.
      [Jeff Trawick, Chris Darroch]
 

Modified: httpd/httpd/branches/2.4.x/docs/conf/httpd.conf.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/conf/httpd.conf.in?rev=1389261&r1=1389260&r2=1389261&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/conf/httpd.conf.in (original)
+++ httpd/httpd/branches/2.4.x/docs/conf/httpd.conf.in Mon Sep 24 09:43:45 2012
@@ -406,13 +406,15 @@ Include @rel_sysconfdir@/extra/proxy-htm
 SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
 </IfModule>
-
-# Deal with user agents that deliberately violate open standards
 #
-<IfModule setenvif_module>
-BrowserMatch "MSIE 10.0;" bad_DNT
-</IfModule>
-<IfModule headers_module>
-RequestHeader unset DNT env=bad_DNT
-</IfModule>
+# uncomment out the below to deal with user agents that deliberately
+# violate open standards by misusing DNT (DNT *must* be a specific
+# end-user choice)
+#
+#<IfModule setenvif_module>
+#BrowserMatch "MSIE 10.0;" bad_DNT
+#</IfModule>
+#<IfModule headers_module>
+#RequestHeader unset DNT env=bad_DNT
+#</IfModule>