Merge pull request #691 from justcoding121/master

less exceptions

Author: honfika

examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs

@@ -26,7 +26,7 @@ public ProxyTestController()
         {
             proxyServer = new ProxyServer();
 
-            proxyServer.EnableHttp2 = true;
+            //proxyServer.EnableHttp2 = true;
 
             // generate root certificate without storing it in file system
             //proxyServer.CertificateManager.CreateRootCertificate(false);

src/Titanium.Web.Proxy/ExplicitClientHandler.cs

@@ -141,26 +141,29 @@ private async Task handleClient(ExplicitProxyEndPoint endPoint, TcpClientConnect
 
                         bool http2Supported = false;
 
-                        var alpn = clientHelloInfo.GetAlpn();
-                        if (alpn != null && alpn.Contains(SslApplicationProtocol.Http2))
+                        if (EnableHttp2)
                         {
-                            // test server HTTP/2 support
-                            try
-                            {
-                                // todo: this is a hack, because Titanium does not support HTTP protocol changing currently
-                                var connection = await tcpConnectionFactory.GetServerConnection(this, connectArgs,
-                                    true, SslExtensions.Http2ProtocolAsList,
-                                    true, cancellationToken);
-
-                                http2Supported = connection.NegotiatedApplicationProtocol ==
-                                                 SslApplicationProtocol.Http2;
-                                
-                                // release connection back to pool instead of closing when connection pool is enabled.
-                                await tcpConnectionFactory.Release(connection, true);
-                            }
-                            catch (Exception)
+                            var alpn = clientHelloInfo.GetAlpn();
+                            if (alpn != null && alpn.Contains(SslApplicationProtocol.Http2))
                             {
-                                // ignore
+                                // test server HTTP/2 support
+                                try
+                                {
+                                    // todo: this is a hack, because Titanium does not support HTTP protocol changing currently
+                                    var connection = await tcpConnectionFactory.GetServerConnection(this, connectArgs,
+                                        true, SslExtensions.Http2ProtocolAsList,
+                                        true, cancellationToken);
+
+                                    http2Supported = connection.NegotiatedApplicationProtocol ==
+                                                     SslApplicationProtocol.Http2;
+
+                                    // release connection back to pool instead of closing when connection pool is enabled.
+                                    await tcpConnectionFactory.Release(connection, true);
+                                }
+                                catch (Exception)
+                                {
+                                    // ignore
+                                }
                             }
                         }
 
@@ -274,7 +277,7 @@ private async Task handleClient(ExplicitProxyEndPoint endPoint, TcpClientConnect
                         // If we detected that client tunnel CONNECTs without SSL by checking for empty client hello then 
                         // this connection should not be HTTPS.
                         var connection = await tcpConnectionFactory.GetServerConnection(this, connectArgs,
-                                                        true, SslExtensions.Http2ProtocolAsList,
+                                                        true, null,
                                                         true, cancellationToken);
 
                         try