From: Jim Jagielski Date: Mon, 24 Sep 2012 09:43:45 +0000 (+0000) Subject: Merge r1386913, r1388825 from trunk: X-Git-Tag: 2.4.4~568 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ac08a1ed10d5c7e2c6319171da0a4968bc7be8a;p=apache Merge r1386913, r1388825 from trunk: Revert r1371878 -- default configuration changes that drop the DNT header from IE10. See: Message-ID: 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 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1389261 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 128669caca..cfd1253d14 100644 --- a/CHANGES +++ b/CHANGES @@ -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] diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in index a46499dd3b..deffada425 100644 --- a/docs/conf/httpd.conf.in +++ b/docs/conf/httpd.conf.in @@ -406,13 +406,15 @@ Include @rel_sysconfdir@/extra/proxy-html.conf SSLRandomSeed startup builtin SSLRandomSeed connect builtin - -# Deal with user agents that deliberately violate open standards # - -BrowserMatch "MSIE 10.0;" bad_DNT - - -RequestHeader unset DNT env=bad_DNT - +# 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) +# +# +#BrowserMatch "MSIE 10.0;" bad_DNT +# +# +#RequestHeader unset DNT env=bad_DNT +#