From: Jim Jagielski <jim@apache.org>
Date: Tue, 3 Nov 2015 11:58:58 +0000 (+0000)
Subject: Merge r1707831 from trunk:
X-Git-Tag: 2.4.18~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d560d2b9400ddc782397b612c8d3d1f8d352f83d;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1707831 from trunk:

PR 53845: Remove commented config regarding DNT because the spec now has CR status (confirming our interpretation) and MS has committed to changing their implementation: http://blogs.microsoft.com/on-the-issues/2015/04/03/an-update-on-microsofts-approach-to-do-not-track/
Submitted by: fielding
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1712265 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 48f5e510b8e..8c552cf928f 100644
--- a/STATUS
+++ b/STATUS
@@ -111,12 +111,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * httpd.conf.in: Remove commented config regarding DNT because the spec
-     now has CR status (confirming our interpretation) and MS has committed
-     to changing their implementation.  PR 53845
-     trunk patch: http://svn.apache.org/r1707831
-     2.4.x patch: http://people.apache.org/~minfrin/httpd-dnt-2.4.patch
-     +1: fielding, covener, sf
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in
index 6e418913774..966d2c3a477 100644
--- a/docs/conf/httpd.conf.in
+++ b/docs/conf/httpd.conf.in
@@ -406,15 +406,4 @@ Include @rel_sysconfdir@/extra/proxy-html.conf
 SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
 </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>