Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Titanium-Web-Proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Titanium-Web-Proxy
Commits
8100b4ea
Commit
8100b4ea
authored
May 08, 2018
by
honfika
Committed by
GitHub
May 08, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #431 from jgilbert2017/jgilbert2017-pullreq
propagate ExceptionFunc to CertificateManager
parents
0ff6870d
687c6cd6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
CertificateManager.cs
Titanium.Web.Proxy/Network/CertificateManager.cs
+5
-1
ProxyServer.cs
Titanium.Web.Proxy/ProxyServer.cs
+4
-1
No files found.
Titanium.Web.Proxy/Network/CertificateManager.cs
View file @
8100b4ea
...
@@ -43,7 +43,7 @@ namespace Titanium.Web.Proxy.Network
...
@@ -43,7 +43,7 @@ namespace Titanium.Web.Proxy.Network
/// </summary>
/// </summary>
private
readonly
ConcurrentDictionary
<
string
,
CachedCertificate
>
certificateCache
;
private
readonly
ConcurrentDictionary
<
string
,
CachedCertificate
>
certificateCache
;
private
readonly
ExceptionHandler
exceptionFunc
;
private
ExceptionHandler
exceptionFunc
;
private
readonly
ConcurrentDictionary
<
string
,
Task
<
X509Certificate2
>>
pendingCertificateCreationTasks
;
private
readonly
ConcurrentDictionary
<
string
,
Task
<
X509Certificate2
>>
pendingCertificateCreationTasks
;
private
ICertificateMaker
certEngine
;
private
ICertificateMaker
certEngine
;
...
@@ -235,6 +235,10 @@ namespace Titanium.Web.Proxy.Network
...
@@ -235,6 +235,10 @@ namespace Titanium.Web.Proxy.Network
/// </summary>
/// </summary>
public
X509KeyStorageFlags
StorageFlag
{
get
;
set
;
}
=
X509KeyStorageFlags
.
Exportable
;
public
X509KeyStorageFlags
StorageFlag
{
get
;
set
;
}
=
X509KeyStorageFlags
.
Exportable
;
public
ExceptionHandler
ExceptionFunc
{
set
=>
exceptionFunc
=
value
;
}
/// <summary>
/// <summary>
/// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
/// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
/// </summary>
/// </summary>
...
...
Titanium.Web.Proxy/ProxyServer.cs
View file @
8100b4ea
...
@@ -221,7 +221,10 @@ namespace Titanium.Web.Proxy
...
@@ -221,7 +221,10 @@ namespace Titanium.Web.Proxy
public
ExceptionHandler
ExceptionFunc
public
ExceptionHandler
ExceptionFunc
{
{
get
=>
exceptionFunc
??
defaultExceptionFunc
;
get
=>
exceptionFunc
??
defaultExceptionFunc
;
set
=>
exceptionFunc
=
value
;
set
{
exceptionFunc
=
value
;
CertificateManager
.
ExceptionFunc
=
value
;
}
}
}
/// <summary>
/// <summary>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment