launchpad-reviewers team mailing list archive

["Thiago F. Pappacena" <pappacena@xxxxxxxxx>]

Thiago F. Pappacena has proposed merging ~pappacena/turnip:http-default-protocol-version into turnip:master.

Commit message:
Fixing default protocol version on HTTP frontend

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~pappacena/turnip/+git/turnip/+merge/390847
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~pappacena/turnip:http-default-protocol-version into turnip:master.

diff --git a/turnip/pack/http.py b/turnip/pack/http.py
index 0a3ee2f..7228295 100644
--- a/turnip/pack/http.py
+++ b/turnip/pack/http.py
@@ -84,7 +84,7 @@ def fail_request(request, message, code=http.INTERNAL_SERVER_ERROR):
 
 def get_protocol_version_from_request(request):
     version_header = request.requestHeaders.getRawHeaders(
-        'git-protocol', [b'version=1'])[0]
+        'git-protocol', [b'version=0'])[0]
     try:
         return six.ensure_binary(version_header).split(b'version=', 1)[1]
     except IndexError:
diff --git a/turnip/pack/tests/test_http.py b/turnip/pack/tests/test_http.py
index 2e901b6..2882669 100644
--- a/turnip/pack/tests/test_http.py
+++ b/turnip/pack/tests/test_http.py
@@ -25,6 +25,7 @@ from turnip.pack import (
     http,
     )
 from turnip.pack.helpers import encode_packet
+from turnip.pack.http import get_protocol_version_from_request
 from turnip.pack.tests.fake_servers import FakeVirtInfoService
 from turnip.tests.compat import mock
 from turnip.version_info import version_info
@@ -283,3 +284,14 @@ class TestHTTPAuthRootResource(TestCase):
         self.assertTrue(d.called)
         self.assertEqual(504, request.responseCode)
         self.assertEqual(b'Path translation timed out.', request.value)
+
+
+class TestProtocolVersion(TestCase):
+    def test_get_protocol_version_from_request_default_zero(self):
+        request = LessDummyRequest("/foo")
+        self.assertEqual(b'0', get_protocol_version_from_request(request))
+
+    def test_get_protocol_version_from_request(self):
+        request = LessDummyRequest("/foo")
+        request.requestHeaders.setRawHeaders('git-protocol', [b'version=2'])
+        self.assertEqual(b'2', get_protocol_version_from_request(request))