Merge pull request #198 from justcoding121/develop

justcoding121 · web-flow · commit 67b4ce04c366 · 2017-04-30T09:40:30.000-04:00
#196 Merge bugfix in develop with beta
diff --git a/Titanium.Web.Proxy/ProxyServer.cs b/Titanium.Web.Proxy/ProxyServer.cs
@@ -407,11 +407,11 @@ public void Start()
             {
                 //current user
                 certificateCacheManager
-                  .TrustRootCertificate(StoreLocation.CurrentUser, exceptionFunc);
+                  .TrustRootCertificate(StoreLocation.CurrentUser, ExceptionFunc);
 
                 //current system
                 certificateCacheManager
-                 .TrustRootCertificate(StoreLocation.LocalMachine, exceptionFunc);
+                 .TrustRootCertificate(StoreLocation.LocalMachine, ExceptionFunc);
             }
 
             if (ForwardToUpstreamGateway && GetCustomUpStreamHttpProxyFunc == null 

Original file line number	Diff line number	Diff line change
`@@ -407,11 +407,11 @@ public void Start()`
`407`	`407`	`{`
`408`	`408`	`//current user`
`409`	`409`	`certificateCacheManager`
`410`		`- .TrustRootCertificate(StoreLocation.CurrentUser, exceptionFunc);`
	`410`	`+ .TrustRootCertificate(StoreLocation.CurrentUser, ExceptionFunc);`
`411`	`411`
`412`	`412`	`//current system`
`413`	`413`	`certificateCacheManager`
`414`		`- .TrustRootCertificate(StoreLocation.LocalMachine, exceptionFunc);`
	`414`	`+ .TrustRootCertificate(StoreLocation.LocalMachine, ExceptionFunc);`
`415`	`415`	`}`
`416`	`416`
`417`	`417`	`if (ForwardToUpstreamGateway && GetCustomUpStreamHttpProxyFunc == null`