Skip to content
This repository was archived by the owner on Jul 9, 2023. It is now read-only.

Commit b11f154

Browse files
honfikahonfika
authored
Merge pull request #607 from justcoding121/master
Merge to beta
2 parents d476e94 + 27660cc commit b11f154

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+70
-157
lines changed

‎examples/Titanium.Web.Proxy.Examples.Wpf/Titanium.Web.Proxy.Examples.Wpf.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,6 @@
142142
</BootstrapperPackage>
143143
</ItemGroup>
144144
<ItemGroup>
145-
<ProjectReference Include="..\..\src\StreamExtended\StreamExtended.csproj">
146-
<Project>{61539dc1-ce80-41e6-a696-8f455ace8d15}</Project>
147-
<Name>StreamExtended</Name>
148-
</ProjectReference>
149145
<ProjectReference Include="..\..\src\Titanium.Web.Proxy\Titanium.Web.Proxy.csproj">
150146
<Project>{91018b6d-a7a9-45be-9cb3-79cbb8b169a6}</Project>
151147
<Name>Titanium.Web.Proxy</Name>

‎src/StreamExtended/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎src/StreamExtended/StreamExtended.csproj

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/StreamExtended/StrongKey.snk

-596 Bytes
Binary file not shown.

‎src/Titanium.Web.Proxy.sln

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26906.1
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29102.190
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{B6DBABDC-C985-4872-9C38-B4E5079CBC4B}"
77
EndProject
@@ -31,8 +31,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Titanium.Web.Proxy.Examples
3131
EndProject
3232
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Titanium.Web.Proxy.IntegrationTests", "..\tests\Titanium.Web.Proxy.IntegrationTests\Titanium.Web.Proxy.IntegrationTests.csproj", "{1D053D72-DCB4-4517-ACDD-D35ADC186950}"
3333
EndProject
34-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StreamExtended", "StreamExtended\StreamExtended.csproj", "{61539DC1-CE80-41E6-A696-8F455ACE8D15}"
35-
EndProject
3634
Global
3735
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3836
Debug|Any CPU = Debug|Any CPU
@@ -81,14 +79,6 @@ Global
8179
{1D053D72-DCB4-4517-ACDD-D35ADC186950}.Release|Any CPU.Build.0 = Release|Any CPU
8280
{1D053D72-DCB4-4517-ACDD-D35ADC186950}.Release|x64.ActiveCfg = Release|Any CPU
8381
{1D053D72-DCB4-4517-ACDD-D35ADC186950}.Release|x64.Build.0 = Release|Any CPU
84-
{61539DC1-CE80-41E6-A696-8F455ACE8D15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
85-
{61539DC1-CE80-41E6-A696-8F455ACE8D15}.Debug|Any CPU.Build.0 = Debug|Any CPU
86-
{61539DC1-CE80-41E6-A696-8F455ACE8D15}.Debug|x64.ActiveCfg = Debug|Any CPU
87-
{61539DC1-CE80-41E6-A696-8F455ACE8D15}.Debug|x64.Build.0 = Debug|Any CPU
88-
{61539DC1-CE80-41E6-A696-8F455ACE8D15}.Release|Any CPU.ActiveCfg = Release|Any CPU
89-
{61539DC1-CE80-41E6-A696-8F455ACE8D15}.Release|Any CPU.Build.0 = Release|Any CPU
90-
{61539DC1-CE80-41E6-A696-8F455ACE8D15}.Release|x64.ActiveCfg = Release|Any CPU
91-
{61539DC1-CE80-41E6-A696-8F455ACE8D15}.Release|x64.Build.0 = Release|Any CPU
9282
EndGlobalSection
9383
GlobalSection(SolutionProperties) = preSolution
9484
HideSolutionNode = FALSE
@@ -100,7 +90,7 @@ Global
10090
{1D053D72-DCB4-4517-ACDD-D35ADC186950} = {BC1E0789-D348-49CF-8B67-5E99D50EDF64}
10191
EndGlobalSection
10292
GlobalSection(ExtensibilityGlobals) = postSolution
103-
EnterpriseLibraryConfigurationToolBinariesPath = .1.505.2\lib\NET35
10493
SolutionGuid = {625C1EB5-44CF-47DE-A85A-B4C8C40ED90A}
94+
EnterpriseLibraryConfigurationToolBinariesPath = .1.505.2\lib\NET35
10595
EndGlobalSection
10696
EndGlobal

‎src/Titanium.Web.Proxy/EventArguments/LimitedStream.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
using System.Globalization;
33
using System.IO;
44
using System.Threading.Tasks;
5-
using StreamExtended;
6-
using StreamExtended.Network;
75
using Titanium.Web.Proxy.Exceptions;
6+
using Titanium.Web.Proxy.StreamExtended.BufferPool;
7+
using Titanium.Web.Proxy.StreamExtended.Network;
88

99
namespace Titanium.Web.Proxy.EventArguments
1010
{

‎src/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
using System.Net;
55
using System.Threading;
66
using System.Threading.Tasks;
7-
using StreamExtended.Network;
87
using Titanium.Web.Proxy.Compression;
98
using Titanium.Web.Proxy.Helpers;
109
using Titanium.Web.Proxy.Http;
1110
using Titanium.Web.Proxy.Http.Responses;
1211
using Titanium.Web.Proxy.Models;
12+
using Titanium.Web.Proxy.StreamExtended.Network;
1313

1414
namespace Titanium.Web.Proxy.EventArguments
1515
{

‎src/Titanium.Web.Proxy/EventArguments/SessionEventArgsBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
using System.Collections.Generic;
33
using System.Net;
44
using System.Threading;
5-
using StreamExtended;
6-
using StreamExtended.Network;
75
using Titanium.Web.Proxy.Helpers;
86
using Titanium.Web.Proxy.Http;
97
using Titanium.Web.Proxy.Models;
108
using Titanium.Web.Proxy.Network;
119
using Titanium.Web.Proxy.Network.Tcp;
10+
using Titanium.Web.Proxy.StreamExtended.BufferPool;
11+
using Titanium.Web.Proxy.StreamExtended.Network;
1212

1313
namespace Titanium.Web.Proxy.EventArguments
1414
{

‎src/Titanium.Web.Proxy/ExplicitClientHandler.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
using System.Security.Cryptography.X509Certificates;
88
using System.Threading;
99
using System.Threading.Tasks;
10-
using StreamExtended;
11-
using StreamExtended.Network;
1210
using Titanium.Web.Proxy.EventArguments;
1311
using Titanium.Web.Proxy.Exceptions;
1412
using Titanium.Web.Proxy.Extensions;
@@ -17,6 +15,9 @@
1715
using Titanium.Web.Proxy.Http2;
1816
using Titanium.Web.Proxy.Models;
1917
using Titanium.Web.Proxy.Network.Tcp;
18+
using Titanium.Web.Proxy.StreamExtended;
19+
using Titanium.Web.Proxy.StreamExtended.Network;
20+
using SslExtensions = Titanium.Web.Proxy.Extensions.SslExtensions;
2021

2122
namespace Titanium.Web.Proxy
2223
{

‎src/Titanium.Web.Proxy/Extensions/SslExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Security.Cryptography.X509Certificates;
66
using System.Threading;
77
using System.Threading.Tasks;
8-
using StreamExtended;
8+
using Titanium.Web.Proxy.StreamExtended;
99

1010
namespace Titanium.Web.Proxy.Extensions
1111
{

‎src/Titanium.Web.Proxy/Extensions/StreamExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.IO;
33
using System.Threading;
44
using System.Threading.Tasks;
5-
using StreamExtended;
5+
using Titanium.Web.Proxy.StreamExtended.BufferPool;
66

77
namespace Titanium.Web.Proxy.Extensions
88
{

‎src/Titanium.Web.Proxy/Helpers/HttpHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
using System.Text.RegularExpressions;
44
using System.Threading;
55
using System.Threading.Tasks;
6-
using StreamExtended;
7-
using StreamExtended.Network;
86
using Titanium.Web.Proxy.Extensions;
97
using Titanium.Web.Proxy.Http;
108
using Titanium.Web.Proxy.Shared;
9+
using Titanium.Web.Proxy.StreamExtended.BufferPool;
10+
using Titanium.Web.Proxy.StreamExtended.Network;
1111

1212
namespace Titanium.Web.Proxy.Helpers
1313
{

‎src/Titanium.Web.Proxy/Helpers/HttpRequestWriter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System.IO;
22
using System.Threading;
33
using System.Threading.Tasks;
4-
using StreamExtended;
54
using Titanium.Web.Proxy.Http;
5+
using Titanium.Web.Proxy.StreamExtended.BufferPool;
66

77
namespace Titanium.Web.Proxy.Helpers
88
{

‎src/Titanium.Web.Proxy/Helpers/HttpResponseWriter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
using System.IO;
33
using System.Threading;
44
using System.Threading.Tasks;
5-
using StreamExtended;
65
using Titanium.Web.Proxy.Http;
6+
using Titanium.Web.Proxy.StreamExtended.BufferPool;
77

88
namespace Titanium.Web.Proxy.Helpers
99
{

‎src/Titanium.Web.Proxy/Helpers/HttpWriter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
using System.Text;
55
using System.Threading;
66
using System.Threading.Tasks;
7-
using StreamExtended;
8-
using StreamExtended.Network;
97
using Titanium.Web.Proxy.Http;
108
using Titanium.Web.Proxy.Shared;
9+
using Titanium.Web.Proxy.StreamExtended.BufferPool;
10+
using Titanium.Web.Proxy.StreamExtended.Network;
1111

1212
namespace Titanium.Web.Proxy.Helpers
1313
{

‎src/Titanium.Web.Proxy/Helpers/TcpHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
using System.Runtime.InteropServices;
44
using System.Threading;
55
using System.Threading.Tasks;
6-
using StreamExtended;
76
using Titanium.Web.Proxy.Extensions;
7+
using Titanium.Web.Proxy.StreamExtended.BufferPool;
88

99
namespace Titanium.Web.Proxy.Helpers
1010
{

‎src/Titanium.Web.Proxy/Http/ConnectRequest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using StreamExtended;
1+
using Titanium.Web.Proxy.StreamExtended;
22

33
namespace Titanium.Web.Proxy.Http
44
{

‎src/Titanium.Web.Proxy/Http/ConnectResponse.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22
using System.Net;
3-
using StreamExtended;
3+
using Titanium.Web.Proxy.StreamExtended;
44

55
namespace Titanium.Web.Proxy.Http
66
{

‎src/Titanium.Web.Proxy/Http/HeaderParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System;
22
using System.Threading;
33
using System.Threading.Tasks;
4-
using StreamExtended.Network;
54
using Titanium.Web.Proxy.Shared;
5+
using Titanium.Web.Proxy.StreamExtended.Network;
66

77
namespace Titanium.Web.Proxy.Http
88
{

‎src/Titanium.Web.Proxy/Network/DebugCustomBufferedStream.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
#if DEBUG
1+

2+
using Titanium.Web.Proxy.StreamExtended.BufferPool;
3+
using Titanium.Web.Proxy.StreamExtended.Network;
4+
#if DEBUG
25
using System;
36
using System.IO;
47
using System.Text;
58
using System.Threading;
6-
using StreamExtended;
7-
using StreamExtended.Network;
89

910
namespace Titanium.Web.Proxy.Network
1011
{

‎src/Titanium.Web.Proxy/Network/ProxyClient.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using StreamExtended.Network;
2-
using Titanium.Web.Proxy.Helpers;
1+
using Titanium.Web.Proxy.Helpers;
32
using Titanium.Web.Proxy.Network.Tcp;
3+
using Titanium.Web.Proxy.StreamExtended.Network;
44

55
namespace Titanium.Web.Proxy.Network
66
{

‎src/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
using System.Text;
99
using System.Threading;
1010
using System.Threading.Tasks;
11-
using StreamExtended.Network;
1211
using Titanium.Web.Proxy.EventArguments;
1312
using Titanium.Web.Proxy.Extensions;
1413
using Titanium.Web.Proxy.Helpers;
1514
using Titanium.Web.Proxy.Http;
1615
using Titanium.Web.Proxy.Models;
16+
using Titanium.Web.Proxy.StreamExtended.Network;
1717

1818
namespace Titanium.Web.Proxy.Network.Tcp
1919
{

‎src/Titanium.Web.Proxy/Network/Tcp/TcpServerConnection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
#endif
66
using System.Net.Sockets;
77
using System.Threading.Tasks;
8-
using StreamExtended.Network;
98
using Titanium.Web.Proxy.Extensions;
109
using Titanium.Web.Proxy.Helpers;
1110
using Titanium.Web.Proxy.Models;
11+
using Titanium.Web.Proxy.StreamExtended.Network;
1212

1313
namespace Titanium.Web.Proxy.Network.Tcp
1414
{

‎src/Titanium.Web.Proxy/ProxyServer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
using System.Security.Cryptography.X509Certificates;
88
using System.Threading;
99
using System.Threading.Tasks;
10-
using StreamExtended;
11-
using StreamExtended.Network;
1210
using Titanium.Web.Proxy.EventArguments;
1311
using Titanium.Web.Proxy.Extensions;
1412
using Titanium.Web.Proxy.Helpers;
1513
using Titanium.Web.Proxy.Helpers.WinHttp;
1614
using Titanium.Web.Proxy.Models;
1715
using Titanium.Web.Proxy.Network;
1816
using Titanium.Web.Proxy.Network.Tcp;
17+
using Titanium.Web.Proxy.StreamExtended.BufferPool;
18+
using Titanium.Web.Proxy.StreamExtended.Network;
1919

2020
namespace Titanium.Web.Proxy
2121
{

‎src/Titanium.Web.Proxy/RequestHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
using System.Text.RegularExpressions;
1010
using System.Threading;
1111
using System.Threading.Tasks;
12-
using StreamExtended.Network;
1312
using Titanium.Web.Proxy.EventArguments;
1413
using Titanium.Web.Proxy.Exceptions;
1514
using Titanium.Web.Proxy.Extensions;
@@ -19,6 +18,7 @@
1918
using Titanium.Web.Proxy.Network;
2019
using Titanium.Web.Proxy.Network.Tcp;
2120
using Titanium.Web.Proxy.Shared;
21+
using Titanium.Web.Proxy.StreamExtended.Network;
2222

2323
namespace Titanium.Web.Proxy
2424
{

‎src/StreamExtended/BufferPool/DefaultBufferPool.cs renamed to ‎src/Titanium.Web.Proxy/StreamExtended/BufferPool/DefaultBufferPool.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections.Concurrent;
22

3-
namespace StreamExtended
3+
namespace Titanium.Web.Proxy.StreamExtended.BufferPool
44
{
55

66
/// <summary>

‎src/StreamExtended/BufferPool/IBufferPool.cs renamed to ‎src/Titanium.Web.Proxy/StreamExtended/BufferPool/IBufferPool.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22

3-
namespace StreamExtended
3+
namespace Titanium.Web.Proxy.StreamExtended.BufferPool
44
{
55
/// <summary>
66
/// Use this interface to implement custom buffer pool.

‎src/StreamExtended/ClientHelloInfo.cs renamed to ‎src/Titanium.Web.Proxy/StreamExtended/ClientHelloInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
using StreamExtended.Models;
21
using System;
32
using System.Collections.Generic;
43
using System.Linq;
54
using System.Text;
5+
using Titanium.Web.Proxy.StreamExtended.Models;
66

7-
namespace StreamExtended
7+
namespace Titanium.Web.Proxy.StreamExtended
88
{
99
/// <summary>
1010
/// Wraps up the client SSL hello information.

‎src/StreamExtended/Models/SslCiphers.cs renamed to ‎src/Titanium.Web.Proxy/StreamExtended/Models/SslCiphers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections.Generic;
22

3-
namespace StreamExtended.Models
3+
namespace Titanium.Web.Proxy.StreamExtended.Models
44
{
55
internal static class SslCiphers
66
{

0 commit comments

Comments
 (0)