Commit 82d35f00 authored by ilushka85's avatar ilushka85

Merge remote-tracking branch 'origin/release'

Conflicts:
	Titanium.Web.Proxy/ProxyServer.cs
parents 1f9b01de 9e75ada2
...@@ -177,9 +177,6 @@ namespace Titanium.Web.Proxy ...@@ -177,9 +177,6 @@ namespace Titanium.Web.Proxy
RootCertificateName = RootCertificateName ?? "Titanium Root Certificate Authority"; RootCertificateName = RootCertificateName ?? "Titanium Root Certificate Authority";
RootCertificateIssuerName = RootCertificateIssuerName ?? "Titanium"; RootCertificateIssuerName = RootCertificateIssuerName ?? "Titanium";
certificateCacheManager = new CertificateManager(RootCertificateIssuerName,
RootCertificateName);
} }
/// <summary> /// <summary>
...@@ -311,6 +308,9 @@ namespace Titanium.Web.Proxy ...@@ -311,6 +308,9 @@ namespace Titanium.Web.Proxy
throw new Exception("Proxy is already running."); throw new Exception("Proxy is already running.");
} }
certificateCacheManager = new CertificateManager(RootCertificateIssuerName,
RootCertificateName);
certTrusted = certificateCacheManager.CreateTrustedRootCertificate(); certTrusted = certificateCacheManager.CreateTrustedRootCertificate();
foreach (var endPoint in ProxyEndPoints) foreach (var endPoint in ProxyEndPoints)
...@@ -350,7 +350,7 @@ namespace Titanium.Web.Proxy ...@@ -350,7 +350,7 @@ namespace Titanium.Web.Proxy
ProxyEndPoints.Clear(); ProxyEndPoints.Clear();
certificateCacheManager.StopClearIdleCertificates(); certificateCacheManager?.StopClearIdleCertificates();
proxyRunning = false; proxyRunning = false;
} }
...@@ -468,7 +468,7 @@ namespace Titanium.Web.Proxy ...@@ -468,7 +468,7 @@ namespace Titanium.Web.Proxy
Stop(); Stop();
} }
certificateCacheManager.Dispose(); certificateCacheManager?.Dispose();
} }
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment