httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1373085 - in /httpd/httpd/branches/2.4.x: ./ STATUS docs/conf/httpd.conf.in
Date Tue, 14 Aug 2012 20:53:32 GMT
Author: jim
Date: Tue Aug 14 20:53:31 2012
New Revision: 1373085

URL: http://svn.apache.org/viewvc?rev=1373085&view=rev
Log:
Merge r1371878 from trunk:

Apache does not tolerate deliberate abuse of open standards

Submitted by: fielding
Reviewed/backported by: jim

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

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1371878

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1373085&r1=1373084&r2=1373085&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Aug 14 20:53:31 2012
@@ -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

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=1373085&r1=1373084&r2=1373085&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 Tue Aug 14 20:53:31 2012
@@ -406,3 +406,13 @@ 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>
+



Mime
View raw message