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
95a8877a
Unverified
Commit
95a8877a
authored
Nov 26, 2017
by
Jehonathan Thomas
Committed by
GitHub
Nov 26, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #338 from justcoding121/develop
3.0.194+
parents
c7ff73ad
21e820ac
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
Bootstrap.ps1
.build/Bootstrap.ps1
+1
-1
Common.psm1
.build/Common.psm1
+1
-1
default.ps1
.build/default.ps1
+1
-1
CertificateManager.cs
Titanium.Web.Proxy/Network/CertificateManager.cs
+1
-1
No files found.
.build/Bootstrap.ps1
View file @
95a8877a
...
@@ -14,7 +14,7 @@ Install-Psake
...
@@ -14,7 +14,7 @@ Install-Psake
$psakeDirectory
=
(
Resolve-Path
$env
:ChocolateyInstall\lib\Psake
*
)
$psakeDirectory
=
(
Resolve-Path
$env
:ChocolateyInstall\lib\Psake
*
)
Import-Module
(
Join-Path
$psakeDirectory
"tools\Psake.psm1"
)
Import-Module
(
Join-Path
$psakeDirectory
"tools\Psake
\Psake
.psm1"
)
if
(
$Help
)
if
(
$Help
)
{
{
...
...
.build/Common.psm1
View file @
95a8877a
...
@@ -24,7 +24,7 @@ function Install-Chocolatey()
...
@@ -24,7 +24,7 @@ function Install-Chocolatey()
function
Install-Psake
()
function
Install-Psake
()
{
{
if
(!(
Test-Path
$env
:ChocolateyInstall\lib\Psake
*
))
if
(!(
Test-Path
$env
:ChocolateyInstall\lib\Psake
\tools\Psake
*
))
{
{
choco
install
psake -y
choco
install
psake -y
}
}
...
...
.build/default.ps1
View file @
95a8877a
...
@@ -54,7 +54,7 @@ Task Restore-Packages {
...
@@ -54,7 +54,7 @@ Task Restore-Packages {
}
}
Task Install-MSBuild
{
Task Install-MSBuild
{
if
(!(
Test-Path
$MSBuild
14
))
if
(!(
Test-Path
$MSBuild
))
{
{
cinst microsoft-build-tools -y
cinst microsoft-build-tools -y
}
}
...
...
Titanium.Web.Proxy/Network/CertificateManager.cs
View file @
95a8877a
...
@@ -53,7 +53,7 @@ namespace Titanium.Web.Proxy.Network
...
@@ -53,7 +53,7 @@ namespace Titanium.Web.Proxy.Network
if
(
certEngine
==
null
)
if
(
certEngine
==
null
)
{
{
certEngine
=
engine
==
CertificateEngine
.
BouncyCastle
?
(
ICertificateMaker
)
new
BCCertificateMaker
(
)
:
new
WinCertificateMaker
(
);
certEngine
=
engine
==
CertificateEngine
.
BouncyCastle
?
(
ICertificateMaker
)
new
BCCertificateMaker
(
exceptionFunc
)
:
new
WinCertificateMaker
(
exceptionFunc
);
}
}
}
}
}
}
...
...
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