Merge pull request #4463 from mvanaltvorst/donottrack

Remove outdated X-Do-Not-Track

doc/changelog.asciidoc

@@ -79,6 +79,7 @@ Fixed
 - When `scrolling.bar = True` was set in versions before v1.5.0, this now
   correctly gets migrated to `always` instead of `when-searching`.
 - Completion highlighting now works again on Qt 5.11.3 and 5.12.1.
+- The outdated header `X-Do-Not-Track` is no longer sent.
 
 v1.5.2
 ------

qutebrowser/browser/shared.py

@@ -42,7 +42,6 @@ def custom_headers(url):
     if dnt_config is not None:
         dnt = b'1' if dnt_config else b'0'
         headers[b'DNT'] = dnt
-        headers[b'X-Do-Not-Track'] = dnt
 
     conf_headers = config.instance.get('content.headers.custom', url=url)
     for header, value in conf_headers.items():

tests/end2end/features/misc.feature

@@ -331,19 +331,16 @@ Feature: Various utility commands.
         When I set content.headers.do_not_track to true
         And I open headers
         Then the header Dnt should be set to 1
-        And the header X-Do-Not-Track should be set to 1
 
     Scenario: DNT header (off)
         When I set content.headers.do_not_track to false
         And I open headers
         Then the header Dnt should be set to 0
-        And the header X-Do-Not-Track should be set to 0
 
     Scenario: DNT header (unset)
         When I set content.headers.do_not_track to <empty>
         And I open headers
         Then the header Dnt should be set to <unset>
-        And the header X-Do-Not-Track should be set to <unset>
 
     Scenario: Accept-Language header
         When I set content.headers.accept_language to en,de

tests/unit/browser/test_shared.py

@@ -26,18 +26,15 @@ from qutebrowser.browser import shared
 
 @pytest.mark.parametrize('dnt, accept_language, custom_headers, expected', [
     # DNT
-    (True, None, {}, {b'DNT': b'1', b'X-Do-Not-Track': b'1'}),
-    (False, None, {}, {b'DNT': b'0', b'X-Do-Not-Track': b'0'}),
+    (True, None, {}, {b'DNT': b'1'}),
+    (False, None, {}, {b'DNT': b'0'}),
     (None, None, {}, {}),
     # Accept-Language
-    (False, 'de, en', {}, {b'DNT': b'0', b'X-Do-Not-Track': b'0',
-                           b'Accept-Language': b'de, en'}),
+    (False, 'de, en', {}, {b'DNT': b'0', b'Accept-Language': b'de, en'}),
     # Custom headers
-    (False, None, {'X-Qute': 'yes'}, {b'DNT': b'0', b'X-Do-Not-Track': b'0',
-                                      b'X-Qute': b'yes'}),
+    (False, None, {'X-Qute': 'yes'}, {b'DNT': b'0', b'X-Qute': b'yes'}),
     # Mixed
     (False, 'de, en', {'X-Qute': 'yes'}, {b'DNT': b'0',
-                                          b'X-Do-Not-Track': b'0',
                                           b'Accept-Language': b'de, en',
                                           b'X-Qute': b'yes'}),
 ])