From c3597b4325647ef97899dab65bfb39a57a461975 Mon Sep 17 00:00:00 2001 From: justcoding121 Date: Sat, 30 Mar 2019 21:01:07 -0400 Subject: [PATCH 1/2] fix grammer --- PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index e67b53334..c90d70712 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -1,4 +1,4 @@ Doneness: - [ ] Build is okay - I made sure that this change is building successfully. - [ ] No Bugs - I made sure that this change is working properly as expected. It doesn't have any bugs that you are aware of. -- [ ] Branching - If this is not a hotfix, I am making this request against master branch +- [ ] Branching - If this is not a hotfix, I am making this request against the master branch From 0f19fea86f5c9ff9a7fb8e4e66dc9e7e36346ece Mon Sep 17 00:00:00 2001 From: justcoding121 Date: Sat, 30 Mar 2019 21:31:33 -0400 Subject: [PATCH 2/2] Update DefaultCertificateDiskCache.cs --- .../Network/DefaultCertificateDiskCache.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Titanium.Web.Proxy/Network/DefaultCertificateDiskCache.cs b/src/Titanium.Web.Proxy/Network/DefaultCertificateDiskCache.cs index 485b83261..ef0bdbc22 100644 --- a/src/Titanium.Web.Proxy/Network/DefaultCertificateDiskCache.cs +++ b/src/Titanium.Web.Proxy/Network/DefaultCertificateDiskCache.cs @@ -59,6 +59,12 @@ public void Clear() private X509Certificate2 loadCertificate(string path, string password, X509KeyStorageFlags storageFlags) { byte[] exported; + + if (!File.Exists(path)) + { + return null; + } + try { exported = File.ReadAllBytes(path);