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
82d35f00
Commit
82d35f00
authored
Sep 27, 2016
by
ilushka85
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/release'
Conflicts: Titanium.Web.Proxy/ProxyServer.cs
parents
1f9b01de
9e75ada2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
ProxyServer.cs
Titanium.Web.Proxy/ProxyServer.cs
+5
-5
No files found.
Titanium.Web.Proxy/ProxyServer.cs
View file @
82d35f00
...
@@ -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
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