From aeab1fa6672f747b292cfd1b12d8ea8c09e3274d Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Tue, 14 Aug 2012 20:53:31 +0000 Subject: [PATCH] Merge r1371878 from trunk: Apache does not tolerate deliberate abuse of open standards Submitted by: fielding Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1373085 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 11 ----------- docs/conf/httpd.conf.in | 10 ++++++++++ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/STATUS b/STATUS index 2ac399ca34..937e338681 100644 --- a/STATUS +++ b/STATUS @@ -93,17 +93,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x patch: trunk patch works +1: rjung, humbedooh, trawick (needs CHANGES entry) - * httpd.conf.in: remove DNT header field from MSIE 10.0 requests because - the browser is deliberately violating the standard under development. - trunk patch: http://svn.apache.org/viewvc?rev=1371878&view=rev - 2.4.x patch: trunk patch works - +1: fielding, gstein, jim - rjung: What about not needing mod_setenvif: - RequestHeader unset DNT "expr=%{HTTP_USER_AGENT} -strmatch '*MSIE 10.0;*'" - -- fielding: I prefer the separate syntax. I want the env variable - to be set for apps/logging, and it allows the same treatment - to be applied to other user agents that go bad. - * Correctly log the error returned by apr_dbd_pvselect(). trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1364229 2.4.x patch: trunk patch works diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in index 3e01d4fd77..a46499dd3b 100644 --- a/docs/conf/httpd.conf.in +++ b/docs/conf/httpd.conf.in @@ -406,3 +406,13 @@ 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 + + -- 2.50.1