Merge pull request #4023 from rbdixon/http2_response_fix

HTTP2 response reason is None, render as '' in property.

2 files changed, 12 insertions, 2 deletions

diff --git a/mitmproxy/net/http/response.py b/mitmproxy/net/http/response.py
index 2e864405..c4dbf408 100644
--- a/mitmproxy/net/http/response.py
+++ b/mitmproxy/net/http/response.py
@@ -122,10 +122,14 @@ class Response(message.Message):
     def reason(self):
         """
         HTTP Reason Phrase, e.g. "Not Found".
-        This is always :py:obj:`None` for HTTP2 requests, because HTTP2 responses do not contain a reason phrase.
+        HTTP2 responses do not contain a reason phrase and self.data.reason will be :py:obj:`None`.
+        When :py:obj:`None` return an empty reason phrase so that functions expecting a string work properly.
         """
         # Encoding: http://stackoverflow.com/a/16674906/934719
-        return self.data.reason.decode("ISO-8859-1", "surrogateescape")
+        if self.data.reason is not None:
+            return self.data.reason.decode("ISO-8859-1", "surrogateescape")
+        else:
+            return ""
 
     @reason.setter
     def reason(self, reason):
diff --git a/test/mitmproxy/net/http/test_response.py b/test/mitmproxy/net/http/test_response.py
index 27c16be6..08d72840 100644
--- a/test/mitmproxy/net/http/test_response.py
+++ b/test/mitmproxy/net/http/test_response.py
@@ -77,6 +77,12 @@ class TestResponseCore:
         resp.data.reason = b'cr\xe9e'
         assert resp.reason == "crée"
 
+        # HTTP2 responses do not contain a reason phrase and self.data.reason will be None.
+        # This should render to an empty reason phrase so that functions
+        # expecting a string work properly.
+        resp.data.reason = None
+        assert resp.reason == ""
+
 
 class TestResponseUtils:
     """