Merge lp:~jelmer/brz/http-header-overrides into lp:brz

[Jelmer Vernooij]

Only set default HTTP headers if they weren't provided by the caller.

Only set default HTTP headers if they weren't provided by the caller.

Any suggetions on how to properly test this?

[Vincent Ladeuil (vila)]

> Any suggestions on how to properly test this?

Setting up a dedicated http server to check which headers (or even only the ones the test cares about) are received seems to be the most appropriate.

[Martin Packman (gz)]

Thanks.

review: Approve

[The Breezy Bot (the-breezy-bot)]

Voting criteria not met
https://ci.breezy-vcs.org/job/brz-dev/48/

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/plugins/launchpad/lp_registration.py'
--- breezy/plugins/launchpad/lp_registration.py	2017-09-26 00:55:04 +0000
+++ breezy/plugins/launchpad/lp_registration.py	2018-03-08 23:28:51 +0000
@@ -74,8 +74,7 @@
         self.verbose = verbose
         url = self._scheme + "://" + host + handler
         request = _urllib2_wrappers.Request("POST", url, request_body)
-        # FIXME: _urllib2_wrappers will override user-agent with its own
-        # request.add_header("User-Agent", self.user_agent)
+        request.add_header("User-Agent", self.user_agent)
         request.add_header("Content-Type", "text/xml")
 
         response = self._opener.open(request)
@@ -122,7 +121,7 @@
         if transport is None:
             uri_type = urllib.splittype(self.service_url)[0]
             transport = XMLRPCTransport(uri_type)
-            transport.user_agent = 'bzr/%s (xmlrpclib/%s)' \
+            transport.user_agent = 'Breezy/%s (xmlrpclib/%s)' \
                     % (_breezy_version, xmlrpclib.__version__)
         self.transport = transport
 

=== modified file 'breezy/transport/http/_urllib2_wrappers.py'
--- breezy/transport/http/_urllib2_wrappers.py	2018-01-23 01:12:07 +0000
+++ breezy/transport/http/_urllib2_wrappers.py	2018-03-08 23:28:51 +0000
@@ -669,7 +669,9 @@
     def http_request(self, request):
         """Common headers setting"""
 
-        request.headers.update(self._default_headers.copy())
+        for name, value in self._default_headers.items():
+            if name not in request.headers:
+                request.headers[name] = value
         # FIXME: We may have to add the Content-Length header if
         # we have data to send.
         return request

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2018-02-09 23:09:53 +0000
+++ doc/en/release-notes/brz-3.0.txt	2018-03-08 23:28:51 +0000
@@ -260,6 +260,9 @@
 .. Major internal changes, unlikely to be visible to users or plugin 
    developers, but interesting for brz developers.
 
+* Allow overriding of default HTTP headers by caller.
+  (Jelmer Vernooij, #1753734)
+
 Testing
 *******