Merge branch 'develop' of https://github.com/justcoding121/Titanium-Web-Proxy into develop

Author: honfika

Titanium.Web.Proxy/Extensions/FuncExtensions.cs

@@ -23,10 +23,9 @@ private static async Task InternalInvokeAsync<T>(AsyncEventHandler<T> callback,
             {
                 await callback(sender, args);
             }
-            catch (Exception ex)
+            catch (Exception e)
             {
-                var ex2 = new Exception("Exception thrown in user event", ex);
-                exceptionFunc(ex2);
+                exceptionFunc(new Exception("Exception thrown in user event", e));
             }
         }
     }

Titanium.Web.Proxy/ProxyServer.cs

@@ -660,21 +660,6 @@ private void QuitListen(ProxyEndPoint endPoint)
             endPoint.Listener.Server.Dispose();
         }
 
-        private async Task InvokeBeforeRequest(SessionEventArgs args)
-        {
-            if (BeforeRequest != null)
-            {
-                await BeforeRequest.InvokeAsync(this, args, ExceptionFunc);
-            }
-        }
-
-        private async Task InvokeBeforeResponse(SessionEventArgs args)
-        {
-            if (BeforeResponse != null)
-            {
-                await BeforeResponse.InvokeAsync(this, args, ExceptionFunc);
-            }
-        }
 
         internal void UpdateClientConnectionCount(bool increment)
         {

Titanium.Web.Proxy/RequestHandler.cs

@@ -599,5 +599,13 @@ private void PrepareRequestHeaders(HeaderCollection requestHeaders)
 
             requestHeaders.FixProxyHeaders();
         }
+
+        private async Task InvokeBeforeRequest(SessionEventArgs args)
+        {
+            if (BeforeRequest != null)
+            {
+                await BeforeRequest.InvokeAsync(this, args, ExceptionFunc);
+            }
+        }
     }
 }

Titanium.Web.Proxy/ResponseHandler.cs

@@ -125,5 +125,14 @@ private async Task<byte[]> GetCompressedResponseBody(string encodingType, byte[]
             var compressor = CompressionFactory.GetCompression(encodingType);
             return await compressor.Compress(responseBodyStream);
         }
+
+
+        private async Task InvokeBeforeResponse(SessionEventArgs args)
+        {
+            if (BeforeResponse != null)
+            {
+                await BeforeResponse.InvokeAsync(this, args, ExceptionFunc);
+            }
+        }
     }
 }