Merge pull request #901 from justcoding121/develop

http2 fix
justcoding121 · Jan 29, 2022 · 28ed4c9 · 28ed4c9
2 parents f74219a + 04fa2f9
commit 28ed4c9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/examples/Titanium.Web.Proxy.Examples.Wpf/SessionListItem.cs b/examples/Titanium.Web.Proxy.Examples.Wpf/SessionListItem.cs
@@ -146,7 +146,7 @@ public void Update(SessionEventArgsBase args)
             var response = HttpClient.Response;
             int statusCode = response?.StatusCode ?? 0;
             StatusCode = statusCode == 0 ? "-" : statusCode.ToString();
-            Protocol = request.RequestUri.Scheme;
+            Protocol = request.HttpVersion.Major == 2 ? "http2" : request.RequestUri.Scheme;
             ClientConnectionId = args.ClientConnectionId;
             ServerConnectionId = args.ServerConnectionId;
 

diff --git a/src/Titanium.Web.Proxy/Http/KnownHeaders.cs b/src/Titanium.Web.Proxy/Http/KnownHeaders.cs
@@ -11,6 +11,7 @@ public static class KnownHeaders
         public static KnownHeader ConnectionKeepAlive = "keep-alive";
 
         public static KnownHeader ContentLength = "Content-Length";
+        public static KnownHeader ContentLengthHttp2 = "content-length";
 
         public static KnownHeader ContentType = "Content-Type";
         public static KnownHeader ContentTypeCharset = "charset";
@@ -48,4 +49,4 @@ public static class KnownHeaders
         public static KnownHeader TransferEncoding = "Transfer-Encoding";
         public static KnownHeader TransferEncodingChunked = "chunked";
     }
-}
+}
diff --git a/src/Titanium.Web.Proxy/Http/RequestResponseBase.cs b/src/Titanium.Web.Proxy/Http/RequestResponseBase.cs
@@ -105,7 +105,10 @@ public long ContentLength
             {
                 if (value >= 0)
                 {
-                    Headers.SetOrAddHeaderValue(KnownHeaders.ContentLength, value.ToString());
+                    Headers.SetOrAddHeaderValue(
+                        HttpVersion >= HttpHeader.Version20
+                            ? KnownHeaders.ContentLengthHttp2
+                            : KnownHeaders.ContentLength, value.ToString());
                     IsChunked = false;
                 }
                 else

diff --git a/src/Titanium.Web.Proxy/Http/Response.cs b/src/Titanium.Web.Proxy/Http/Response.cs
@@ -66,6 +66,11 @@ public override bool HasBody
                     return true;
                 }
 
+                if (ContentLength == -1 && HttpVersion == HttpHeader.Version20)
+                {
+                    return true;
+                } 
+
                 // has response if connection:keep-alive header exist and when version is http/1.0
                 // Because in Http 1.0 server can return a response without content-length (expectation being client would read until end of stream)
                 if (KeepAlive && HttpVersion == HttpHeader.Version10)