Merge pull request #331 from justcoding121/develop

Beta 3.0.171+ review

Author: justcoding121

Examples/Titanium.Web.Proxy.Examples.Wpf/MainWindow.xaml.cs

@@ -11,6 +11,7 @@
 using Titanium.Web.Proxy.Helpers;
 using Titanium.Web.Proxy.Http;
 using Titanium.Web.Proxy.Models;
+using Titanium.Web.Proxy.Network;
 
 namespace Titanium.Web.Proxy.Examples.Wpf
 {
@@ -62,7 +63,9 @@ public int ServerConnectionCount
         public MainWindow()
         {
             proxyServer = new ProxyServer();
+            //proxyServer.CertificateEngine = CertificateEngine.BouncyCastle;
             proxyServer.TrustRootCertificate = true;
+            proxyServer.CertificateManager.TrustRootCertificateAsAdministrator();
             proxyServer.ForwardToUpstreamGateway = true;
 
             var explicitEndPoint = new ExplicitProxyEndPoint(IPAddress.Any, 8000, true)

Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs

@@ -82,14 +82,9 @@ public bool ReRequest
         public HttpWebClient WebSession { get; }
 
         /// <summary>
-        /// Are we using a custom upstream HTTP proxy?
+        /// Are we using a custom upstream HTTP(S) proxy?
         /// </summary>
-        public ExternalProxy CustomUpStreamHttpProxyUsed { get; internal set; }
-
-        /// <summary>
-        /// Are we using a custom upstream HTTPS proxy?
-        /// </summary>
-        public ExternalProxy CustomUpStreamHttpsProxyUsed { get; internal set; }
+        public ExternalProxy CustomUpStreamProxyUsed { get; internal set; }
 
         public event EventHandler<DataEventArgs> DataSent;
 
@@ -519,8 +514,7 @@ public async Task Respond(Response response)
         public void Dispose()
         {
             httpResponseHandler = null;
-            CustomUpStreamHttpProxyUsed = null;
-            CustomUpStreamHttpsProxyUsed = null;
+            CustomUpStreamProxyUsed = null;
 
             WebSession.FinishSession();
         }

Titanium.Web.Proxy/Http/HttpWebClient.cs

@@ -87,7 +87,7 @@ internal async Task SendRequest(bool enable100ContinueBehaviour)
             using (var ms = new MemoryStream())
             using (var writer = new HttpRequestWriter(ms, bufferSize))
             {
-                var upstreamProxy = ServerConnection.UpStreamHttpProxy;
+                var upstreamProxy = ServerConnection.UpStreamProxy;
 
                 bool useUpstreamProxy = upstreamProxy != null && ServerConnection.IsHttps == false;