D2843: url: support suppressing Accept header

Previous Topic Next Topic
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view

D2843: url: support suppressing Accept header

martinvonz (Martin von Zweigbergk)
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

  Sending this header automatically could interfere with future
  testing and client behavior. Let's add a knob to disable the
  We don't have a control for User-Agent because urllib will send
  it if we don't set something. I don't feel like hacking into the
  bowels of urllib to figure out how to suppress that. UA shouldn't
  be used for anything meaningful. So it shouldn't pose any problems
  beyond non-determinism (since the header has the Mercurial version in

  rHG Mercurial




diff --git a/tests/test-http-protocol.t b/tests/test-http-protocol.t
--- a/tests/test-http-protocol.t
+++ b/tests/test-http-protocol.t
@@ -215,15 +215,13 @@
   $ hg --verbose debugwireproto --peer raw <a href="http://$LOCALIP:$HGPORT">http://$LOCALIP:$HGPORT << EOF
   > httprequest GET ?cmd=listkeys
-  >     accept: application/mercurial-0.1
-  >     user-agent: mercurial/proto-1.0 (Mercurial 42)
+  >     user-agent: test
   >     x-hgarg-1: namespace=namespaces
   > EOF
   using raw connection to peer
   s>     GET /?cmd=listkeys HTTP/1.1\r\n
   s>     Accept-Encoding: identity\r\n
-  s>     accept: application/mercurial-0.1\r\n
-  s>     user-agent: mercurial/proto-1.0 (Mercurial 42)\r\n (glob)
+  s>     user-agent: test\r\n
   s>     x-hgarg-1: namespace=namespaces\r\n
   s>     host: $LOCALIP:$HGPORT\r\n (glob)
   s>     \r\n
diff --git a/mercurial/url.py b/mercurial/url.py
--- a/mercurial/url.py
+++ b/mercurial/url.py
@@ -494,7 +494,7 @@
 handlerfuncs = []
 def opener(ui, authinfo=None, useragent=None, loggingfh=None,
-           loggingname=b's', loggingopts=None):
+           loggingname=b's', loggingopts=None, sendaccept=True):
     construct an opener suitable for urllib2
     authinfo will be added to the password manager
@@ -506,6 +506,9 @@
     ``loggingname`` denotes the name of the to print when logging.
     ``loggingopts`` is a dict of keyword arguments to pass to the constructed
     ``util.socketobserver`` instance.
+    ``sendaccept`` allows controlling whether the ``Accept`` request header
+    is sent. The header is sent by default.
     handlers = []
@@ -562,7 +565,9 @@
     # been sent on all requests since forever. We keep sending it for backwards
     # compatibility reasons. Modern versions of the wire protocol use
     # X-HgProto-<N> for advertising client support.
-    opener.addheaders.append((r'Accept', r'application/mercurial-0.1'))
+    if sendaccept:
+        opener.addheaders.append((r'Accept', r'application/mercurial-0.1'))
     return opener
 def open(ui, url_, data=None):
diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -2832,6 +2832,12 @@
         if ui.debugflag:
             openerargs[r'loggingopts'][r'logdataapis'] = True
+        # Don't send default headers when in raw mode. This allows us to
+        # bypass most of the behavior of our URL handling code so we can
+        # have near complete control over what's sent on the wire.
+        if opts['peer'] == 'raw':
+            openerargs[r'sendaccept'] = False
         opener = urlmod.opener(ui, authinfo, **openerargs)
         if opts['peer'] == 'raw':

To: indygreg, #hg-reviewers
Cc: mercurial-devel
Mercurial-devel mailing list
[hidden email]