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

Commit 8b890fe

Browse files
honfikahonfika
authored
Merge pull request #613 from justcoding121/beta
Beta to stable
2 parents 4d63596 + d58edd6 commit 8b890fe

File tree

113 files changed

+4897
-720
lines changed

Some content is hidden

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

113 files changed

+4897
-720
lines changed

‎PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Doneness:
22
- [ ] Build is okay - I made sure that this change is building successfully.
33
- [ ] No Bugs - I made sure that this change is working properly as expected. It doesn't have any bugs that you are aware of.
4-
- [ ] Branching - If this is not a hotfix, I am making this request against master branch
4+
- [ ] Branching - If this is not a hotfix, I am making this request against the master branch

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
## Titanium Web Proxy
22

3+
### Note: This Project is no longer maintained. Any pull requests for fixes are welcome.
4+
35
A lightweight HTTP(S) proxy server written in C#.
46

57
<a href="https://ci.appveyor.com/project/justcoding121/titanium-web-proxy">![Build Status](https://ci.appveyor.com/api/projects/status/p5vvtbpx9yp250ol?svg=true)</a> [![Join the chat at https://gitter.im/Titanium-Web-Proxy/Lobby](https://badges.gitter.im/Titanium-Web-Proxy/Lobby.svg)](https://gitter.im/Titanium-Web-Proxy/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -36,7 +38,7 @@ Supports
3638

3739
#### Windows
3840
* Visual Studio Code as IDE for .NET core
39-
* Visual Studio 2017 as IDE for .NET framework/.NET core
41+
* Visual Studio 2017/2019 as IDE for .NET framework/.NET core
4042

4143
#### Mac OS
4244
* Visual Studio Code as IDE for .NET core

‎docs/api/Titanium.Web.Proxy.EventArguments.CertificateSelectionEventArgs.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ <h3 id="properties">Properties
136136
</span>
137137
<a id="Titanium_Web_Proxy_EventArguments_CertificateSelectionEventArgs_AcceptableIssuers_" data-uid="Titanium.Web.Proxy.EventArguments.CertificateSelectionEventArgs.AcceptableIssuers*"></a>
138138
<h4 id="Titanium_Web_Proxy_EventArguments_CertificateSelectionEventArgs_AcceptableIssuers" data-uid="Titanium.Web.Proxy.EventArguments.CertificateSelectionEventArgs.AcceptableIssuers">AcceptableIssuers</h4>
139-
<div class="markdown level1 summary"><p>Acceptable issuers as listed by remoted server.</p>
139+
<div class="markdown level1 summary"><p>Acceptable issuers as listed by remote server.</p>
140140
</div>
141141
<div class="markdown level1 conceptual"></div>
142142
<h5 class="decalaration">Declaration</h5>

‎docs/api/Titanium.Web.Proxy.EventArguments.SessionEventArgs.html‎

Lines changed: 53 additions & 22 deletions
Large diffs are not rendered by default.

‎docs/api/Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.html‎

Lines changed: 26 additions & 26 deletions
Large diffs are not rendered by default.

‎docs/api/Titanium.Web.Proxy.EventArguments.TunnelConnectSessionEventArgs.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@ <h5>Implements</h5>
100100
<div class="inheritedMembers">
101101
<h5>Inherited Members</h5>
102102
<div>
103-
<a class="xref" href="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.html#Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_bufferSize">SessionEventArgsBase.bufferSize</a>
103+
<a class="xref" href="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.html#Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_BufferSize">SessionEventArgsBase.BufferSize</a>
104104
</div>
105105
<div>
106-
<a class="xref" href="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.html#Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_bufferPool">SessionEventArgsBase.bufferPool</a>
106+
<a class="xref" href="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.html#Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_BufferPool">SessionEventArgsBase.BufferPool</a>
107107
</div>
108108
<div>
109-
<a class="xref" href="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.html#Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_exceptionFunc">SessionEventArgsBase.exceptionFunc</a>
109+
<a class="xref" href="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.html#Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_ExceptionFunc">SessionEventArgsBase.ExceptionFunc</a>
110110
</div>
111111
<div>
112112
<a class="xref" href="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.html#Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_TimeLine">SessionEventArgsBase.TimeLine</a>
@@ -255,7 +255,7 @@ <h5 class="propertyValue">Property Value</h5>
255255
</span>
256256
<a id="Titanium_Web_Proxy_EventArguments_TunnelConnectSessionEventArgs_IsHttpsConnect_" data-uid="Titanium.Web.Proxy.EventArguments.TunnelConnectSessionEventArgs.IsHttpsConnect*"></a>
257257
<h4 id="Titanium_Web_Proxy_EventArguments_TunnelConnectSessionEventArgs_IsHttpsConnect" data-uid="Titanium.Web.Proxy.EventArguments.TunnelConnectSessionEventArgs.IsHttpsConnect">IsHttpsConnect</h4>
258-
<div class="markdown level1 summary"><p>Is this a connect request to secure HTTP server? Or is it to someother protocol.</p>
258+
<div class="markdown level1 summary"><p>Is this a connect request to secure HTTP server? Or is it to some other protocol.</p>
259259
</div>
260260
<div class="markdown level1 conceptual"></div>
261261
<h5 class="decalaration">Declaration</h5>

‎docs/api/Titanium.Web.Proxy.Exceptions.ProxyException.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ <h5 class="parameters">Parameters</h5>
236236
<tr>
237237
<td><a class="xref" href="https://docs.microsoft.com/dotnet/api/system.string">String</a></td>
238238
<td><span class="parametername">message</span></td>
239-
<td><p>Excception message</p>
239+
<td><p>Exception message</p>
240240
</td>
241241
</tr>
242242
<tr>

‎docs/api/Titanium.Web.Proxy.Http.ConnectRequest.html‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ <h5>Inherited Members</h5>
107107
<div>
108108
<a class="xref" href="Titanium.Web.Proxy.Http.Request.html#Titanium_Web_Proxy_Http_Request_OriginalUrl">Request.OriginalUrl</a>
109109
</div>
110+
<div>
111+
<a class="xref" href="Titanium.Web.Proxy.Http.Request.html#Titanium_Web_Proxy_Http_Request_RequestUriString">Request.RequestUriString</a>
112+
</div>
110113
<div>
111114
<a class="xref" href="Titanium.Web.Proxy.Http.Request.html#Titanium_Web_Proxy_Http_Request_HasBody">Request.HasBody</a>
112115
</div>
@@ -222,7 +225,7 @@ <h3 id="properties">Properties
222225
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/master/apiSpec/new?filename=Titanium_Web_Proxy_Http_ConnectRequest_ClientHelloInfo.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.Http.ConnectRequest.ClientHelloInfo%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
223226
</span>
224227
<span class="small pull-right mobile-hide">
225-
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/master/src/Titanium.Web.Proxy/Http/ConnectRequest.cs/#L15">View Source</a>
228+
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/master/src/Titanium.Web.Proxy/Http/ConnectRequest.cs/#L17">View Source</a>
226229
</span>
227230
<a id="Titanium_Web_Proxy_Http_ConnectRequest_ClientHelloInfo_" data-uid="Titanium.Web.Proxy.Http.ConnectRequest.ClientHelloInfo*"></a>
228231
<h4 id="Titanium_Web_Proxy_Http_ConnectRequest_ClientHelloInfo" data-uid="Titanium.Web.Proxy.Http.ConnectRequest.ClientHelloInfo">ClientHelloInfo</h4>
@@ -242,7 +245,37 @@ <h5 class="propertyValue">Property Value</h5>
242245
</thead>
243246
<tbody>
244247
<tr>
245-
<td><span class="xref">StreamExtended.ClientHelloInfo</span></td>
248+
<td><span class="xref">ClientHelloInfo</span></td>
249+
<td></td>
250+
</tr>
251+
</tbody>
252+
</table>
253+
<span class="small pull-right mobile-hide">
254+
<span class="divider">|</span>
255+
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/master/apiSpec/new?filename=Titanium_Web_Proxy_Http_ConnectRequest_TunnelType.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.Http.ConnectRequest.TunnelType%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
256+
</span>
257+
<span class="small pull-right mobile-hide">
258+
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/master/src/Titanium.Web.Proxy/Http/ConnectRequest.cs/#L15">View Source</a>
259+
</span>
260+
<a id="Titanium_Web_Proxy_Http_ConnectRequest_TunnelType_" data-uid="Titanium.Web.Proxy.Http.ConnectRequest.TunnelType*"></a>
261+
<h4 id="Titanium_Web_Proxy_Http_ConnectRequest_TunnelType" data-uid="Titanium.Web.Proxy.Http.ConnectRequest.TunnelType">TunnelType</h4>
262+
<div class="markdown level1 summary"></div>
263+
<div class="markdown level1 conceptual"></div>
264+
<h5 class="decalaration">Declaration</h5>
265+
<div class="codewrapper">
266+
<pre><code class="lang-csharp hljs">public TunnelType TunnelType { get; }</code></pre>
267+
</div>
268+
<h5 class="propertyValue">Property Value</h5>
269+
<table class="table table-bordered table-striped table-condensed">
270+
<thead>
271+
<tr>
272+
<th>Type</th>
273+
<th>Description</th>
274+
</tr>
275+
</thead>
276+
<tbody>
277+
<tr>
278+
<td><span class="xref">TunnelType</span></td>
246279
<td></td>
247280
</tr>
248281
</tbody>

‎docs/api/Titanium.Web.Proxy.Http.ConnectResponse.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ <h5 class="propertyValue">Property Value</h5>
201201
</thead>
202202
<tbody>
203203
<tr>
204-
<td><span class="xref">StreamExtended.ServerHelloInfo</span></td>
204+
<td><span class="xref">ServerHelloInfo</span></td>
205205
<td></td>
206206
</tr>
207207
</tbody>

‎docs/api/Titanium.Web.Proxy.Http.HeaderCollection.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ <h5 class="returns">Returns</h5>
517517
<a id="Titanium_Web_Proxy_Http_HeaderCollection_GetHeaders_" data-uid="Titanium.Web.Proxy.Http.HeaderCollection.GetHeaders*"></a>
518518
<h4 id="Titanium_Web_Proxy_Http_HeaderCollection_GetHeaders_System_String_" data-uid="Titanium.Web.Proxy.Http.HeaderCollection.GetHeaders(System.String)">GetHeaders(String)</h4>
519519
<div class="markdown level1 summary"><p>Returns all headers with given name if exists
520-
Returns null if does&apos;nt exist</p>
520+
Returns null if doesn&apos;t exist</p>
521521
</div>
522522
<div class="markdown level1 conceptual"></div>
523523
<h5 class="decalaration">Declaration</h5>

0 commit comments

Comments
 (0)