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
14bdb652
Commit
14bdb652
authored
Jul 13, 2017
by
justcoding121
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'beta' into stable
parents
ca5dfbc2
dd688aa1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
20 deletions
+9
-20
ProxyTestController.cs
.../Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs
+1
-1
CertificateManager.cs
Titanium.Web.Proxy/Network/CertificateManager.cs
+1
-1
ProxyServer.cs
Titanium.Web.Proxy/ProxyServer.cs
+0
-5
Titanium.Web.Proxy.csproj
Titanium.Web.Proxy/Titanium.Web.Proxy.csproj
+2
-2
Titanium.Web.Proxy.nuspec
Titanium.Web.Proxy/Titanium.Web.Proxy.nuspec
+4
-10
packages.config
Titanium.Web.Proxy/packages.config
+1
-1
No files found.
Examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs
View file @
14bdb652
...
@@ -42,7 +42,7 @@ namespace Titanium.Web.Proxy.Examples.Basic
...
@@ -42,7 +42,7 @@ namespace Titanium.Web.Proxy.Examples.Basic
//optionally set the Certificate Engine
//optionally set the Certificate Engine
//Under Mono only BouncyCastle will be supported
//Under Mono only BouncyCastle will be supported
//proxyServer.CertificateEngine = Network.CertificateEngine.
BouncyCastle
;
//proxyServer.CertificateEngine = Network.CertificateEngine.
DefaultWindows
;
//optionally set the Root Certificate
//optionally set the Root Certificate
//proxyServer.RootCertificate = new X509Certificate2("myCert.pfx", string.Empty, X509KeyStorageFlags.Exportable);
//proxyServer.RootCertificate = new X509Certificate2("myCert.pfx", string.Empty, X509KeyStorageFlags.Exportable);
...
...
Titanium.Web.Proxy/Network/CertificateManager.cs
View file @
14bdb652
...
@@ -126,7 +126,7 @@ namespace Titanium.Web.Proxy.Network
...
@@ -126,7 +126,7 @@ namespace Titanium.Web.Proxy.Network
internal
CertificateManager
(
Action
<
Exception
>
exceptionFunc
)
internal
CertificateManager
(
Action
<
Exception
>
exceptionFunc
)
{
{
this
.
exceptionFunc
=
exceptionFunc
;
this
.
exceptionFunc
=
exceptionFunc
;
Engine
=
CertificateEngine
.
DefaultWindows
;
Engine
=
CertificateEngine
.
BouncyCastle
;
certificateCache
=
new
ConcurrentDictionary
<
string
,
CachedCertificate
>();
certificateCache
=
new
ConcurrentDictionary
<
string
,
CachedCertificate
>();
}
}
...
...
Titanium.Web.Proxy/ProxyServer.cs
View file @
14bdb652
...
@@ -36,11 +36,6 @@ namespace Titanium.Web.Proxy
...
@@ -36,11 +36,6 @@ namespace Titanium.Web.Proxy
internal
const
string
UriSchemeHttps
=
"https"
;
internal
const
string
UriSchemeHttps
=
"https"
;
#endif
#endif
/// <summary>
/// Enable the experimental ALPN adder streams
/// </summary>
internal
static
bool
AlpnEnabled
=
false
;
/// <summary>
/// <summary>
/// Is the proxy currently running
/// Is the proxy currently running
/// </summary>
/// </summary>
...
...
Titanium.Web.Proxy/Titanium.Web.Proxy.csproj
View file @
14bdb652
...
@@ -46,8 +46,8 @@
...
@@ -46,8 +46,8 @@
<AssemblyOriginatorKeyFile>
StrongNameKey.snk
</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>
StrongNameKey.snk
</AssemblyOriginatorKeyFile>
</PropertyGroup>
</PropertyGroup>
<ItemGroup>
<ItemGroup>
<Reference
Include=
"BouncyCastle.Crypto
, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942
"
>
<Reference
Include=
"BouncyCastle.Crypto"
>
<HintPath>
..\packages\
BouncyCastle.1.8.1\lib
\BouncyCastle.Crypto.dll
</HintPath>
<HintPath>
..\packages\
Portable.BouncyCastle.1.8.1.2\lib\net4
\BouncyCastle.Crypto.dll
</HintPath>
<Private>
True
</Private>
<Private>
True
</Private>
</Reference>
</Reference>
<Reference
Include=
"StreamExtended, Version=1.0.1.0, Culture=neutral, PublicKeyToken=bbfa0f1d54f50043, processorArchitecture=MSIL"
>
<Reference
Include=
"StreamExtended, Version=1.0.1.0, Culture=neutral, PublicKeyToken=bbfa0f1d54f50043, processorArchitecture=MSIL"
>
...
...
Titanium.Web.Proxy/Titanium.Web.Proxy.nuspec
View file @
14bdb652
...
@@ -3,9 +3,9 @@
...
@@ -3,9 +3,9 @@
<metadata>
<metadata>
<id>
Titanium.Web.Proxy
</id>
<id>
Titanium.Web.Proxy
</id>
<version>
$version$
</version>
<version>
$version$
</version>
<title>
Titanium
web p
roxy
</title>
<title>
Titanium
Web P
roxy
</title>
<authors>
Titanium
</authors>
<authors>
Titanium
Web Proxy GitHub Contributors
</authors>
<owners>
Titanium
</owners>
<owners>
justcoding121
</owners>
<licenseUrl>
https://github.com/justcoding121/Titanium-Web-Proxy/blob/develop/LICENSE
</licenseUrl>
<licenseUrl>
https://github.com/justcoding121/Titanium-Web-Proxy/blob/develop/LICENSE
</licenseUrl>
<projectUrl>
https://github.com/justcoding121/Titanium-Web-Proxy
</projectUrl>
<projectUrl>
https://github.com/justcoding121/Titanium-Web-Proxy
</projectUrl>
<requireLicenseAcceptance>
false
</requireLicenseAcceptance>
<requireLicenseAcceptance>
false
</requireLicenseAcceptance>
...
@@ -14,14 +14,8 @@
...
@@ -14,14 +14,8 @@
<copyright>
Copyright
©
Titanium. All rights reserved.
</copyright>
<copyright>
Copyright
©
Titanium. All rights reserved.
</copyright>
<tags></tags>
<tags></tags>
<dependencies>
<dependencies>
<group
targetFramework=
"net45"
>
<dependency
id=
"StreamExtended"
version=
"1.0.18"
/>
<dependency
id=
"StreamExtended"
version=
"1.0.18"
/>
<dependency
id=
"BouncyCastle"
version=
"1.8.1"
/>
<dependency
id=
"Portable.BouncyCastle"
version=
"1.8.1.2"
/>
</group>
<group
targetFramework=
"netstandard1.6"
>
<dependency
id=
"StreamExtended"
version=
"1.0.18"
/>
<dependency
id=
"Portable.BouncyCastle"
version=
"1.8.1.2"
/>
</group>
</dependencies>
</dependencies>
</metadata>
</metadata>
<files>
<files>
...
...
Titanium.Web.Proxy/packages.config
View file @
14bdb652
<?
xml
version
=
"1.0"
encoding
=
"utf-8"
?>
<?
xml
version
=
"1.0"
encoding
=
"utf-8"
?>
<
packages
>
<
packages
>
<
package
id
=
"
BouncyCastle"
version
=
"1.8.1
"
targetFramework
=
"net45"
/>
<
package
id
=
"
Portable.BouncyCastle"
version
=
"1.8.1.2
"
targetFramework
=
"net45"
/>
<
package
id
=
"StreamExtended"
version
=
"1.0.18"
targetFramework
=
"net45"
/>
<
package
id
=
"StreamExtended"
version
=
"1.0.18"
targetFramework
=
"net45"
/>
</
packages
>
</
packages
>
\ 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