From 7a39c2c71f4e1473f4b7fb648a5a964f5466f8ec Mon Sep 17 00:00:00 2001 From: noisyfox Date: Fri, 16 Dec 2016 12:18:25 +1100 Subject: [PATCH] Revert "Logging exception" This reverts commit 566a0fcfa59205e97e05edc56d63ffccdae80fa2. --- shadowsocks-csharp/Controller/Service/HttpHandler.cs | 3 +-- shadowsocks-csharp/Controller/ShadowsocksController.cs | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shadowsocks-csharp/Controller/Service/HttpHandler.cs b/shadowsocks-csharp/Controller/Service/HttpHandler.cs index 2f1f05b6..5f1e1836 100644 --- a/shadowsocks-csharp/Controller/Service/HttpHandler.cs +++ b/shadowsocks-csharp/Controller/Service/HttpHandler.cs @@ -60,8 +60,7 @@ namespace Shadowsocks.Controller.Service private void OnException(Exception ex, object state) { - Logging.LogUsefulException(ex); - Close(); + throw ex; } private static readonly Regex HttpRequestHeaderRegex = new Regex(@"^([A-Z]+?) ([^\s]+) HTTP/1\.\d$"); diff --git a/shadowsocks-csharp/Controller/ShadowsocksController.cs b/shadowsocks-csharp/Controller/ShadowsocksController.cs index 3e12bddf..79e0d152 100644 --- a/shadowsocks-csharp/Controller/ShadowsocksController.cs +++ b/shadowsocks-csharp/Controller/ShadowsocksController.cs @@ -463,6 +463,7 @@ namespace Shadowsocks.Controller services.Add(_pacServer); services.Add(tcpRelay); services.Add(udpRelay); + //services.Add(new Http2Socks5(_config.localPort)); _listener = new Listener(services); _listener.Start(_config); }