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

Commit f5ac04d

Browse files
committed
Merge branch 'develop' into beta
2 parents 290ed19 + 7265452 commit f5ac04d

20 files changed

+500
-144
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ Supports
3939

4040
* Fix [outstanding bugs](https://github.com/justcoding121/Titanium-Web-Proxy/issues?q=is%3Aopen+is%3Aissue+label%3Abug)
4141
* Support reading request and response body as stream [#823](https://github.com/justcoding121/Titanium-Web-Proxy/issues/823)
42-
* Use Dispose(false) pattern to reduce possibility of memory leaks [#740](https://github.com/justcoding121/Titanium-Web-Proxy/issues/740)
4342
* Stop throwing new exceptions [#634](https://github.com/justcoding121/Titanium-Web-Proxy/issues/634)
4443
* Support HTTP 2.0
4544

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

Lines changed: 41 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,9 @@ <h5>Inherited Members</h5>
163163
<div>
164164
<a class="xref" href="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.html#Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_Exception">SessionEventArgsBase.Exception</a>
165165
</div>
166+
<div>
167+
<a class="xref" href="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.html#Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_Dispose">SessionEventArgsBase.Dispose()</a>
168+
</div>
166169
<div>
167170
<a class="xref" href="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.html#Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_DataSent">SessionEventArgsBase.DataSent</a>
168171
</div>
@@ -365,22 +368,53 @@ <h3 id="methods">Methods
365368
</h3>
366369
<span class="small pull-right mobile-hide">
367370
<span class="divider">|</span>
368-
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/develop/apiSpec/new?filename=Titanium_Web_Proxy_EventArguments_SessionEventArgs_Dispose.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.EventArguments.SessionEventArgs.Dispose%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>
371+
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/develop/apiSpec/new?filename=Titanium_Web_Proxy_EventArguments_SessionEventArgs_Dispose_System_Boolean_.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.EventArguments.SessionEventArgs.Dispose(System.Boolean)%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>
369372
</span>
370373
<span class="small pull-right mobile-hide">
371-
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/develop/src/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs/#L671">View Source</a>
374+
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/develop/src/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs/#L669">View Source</a>
372375
</span>
373376
<a id="Titanium_Web_Proxy_EventArguments_SessionEventArgs_Dispose_" data-uid="Titanium.Web.Proxy.EventArguments.SessionEventArgs.Dispose*"></a>
374-
<h4 id="Titanium_Web_Proxy_EventArguments_SessionEventArgs_Dispose" data-uid="Titanium.Web.Proxy.EventArguments.SessionEventArgs.Dispose">Dispose()</h4>
375-
<div class="markdown level1 summary"><p>Implement any cleanup here</p>
376-
</div>
377+
<h4 id="Titanium_Web_Proxy_EventArguments_SessionEventArgs_Dispose_System_Boolean_" data-uid="Titanium.Web.Proxy.EventArguments.SessionEventArgs.Dispose(System.Boolean)">Dispose(Boolean)</h4>
378+
<div class="markdown level1 summary"></div>
377379
<div class="markdown level1 conceptual"></div>
378380
<h5 class="decalaration">Declaration</h5>
379381
<div class="codewrapper">
380-
<pre><code class="lang-csharp hljs">public override void Dispose()</code></pre>
382+
<pre><code class="lang-csharp hljs">protected override void Dispose(bool disposing)</code></pre>
381383
</div>
384+
<h5 class="parameters">Parameters</h5>
385+
<table class="table table-bordered table-striped table-condensed">
386+
<thead>
387+
<tr>
388+
<th>Type</th>
389+
<th>Name</th>
390+
<th>Description</th>
391+
</tr>
392+
</thead>
393+
<tbody>
394+
<tr>
395+
<td><a class="xref" href="https://docs.microsoft.com/dotnet/api/system.boolean">Boolean</a></td>
396+
<td><span class="parametername">disposing</span></td>
397+
<td></td>
398+
</tr>
399+
</tbody>
400+
</table>
382401
<h5 class="overrides">Overrides</h5>
383-
<div><a class="xref" href="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.html#Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_Dispose">SessionEventArgsBase.Dispose()</a></div>
402+
<div><a class="xref" href="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.html#Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_Dispose_System_Boolean_">SessionEventArgsBase.Dispose(Boolean)</a></div>
403+
<span class="small pull-right mobile-hide">
404+
<span class="divider">|</span>
405+
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/develop/apiSpec/new?filename=Titanium_Web_Proxy_EventArguments_SessionEventArgs_Finalize.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.EventArguments.SessionEventArgs.Finalize%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>
406+
</span>
407+
<span class="small pull-right mobile-hide">
408+
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/develop/src/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs/#L682">View Source</a>
409+
</span>
410+
<a id="Titanium_Web_Proxy_EventArguments_SessionEventArgs_Finalize_" data-uid="Titanium.Web.Proxy.EventArguments.SessionEventArgs.Finalize*"></a>
411+
<h4 id="Titanium_Web_Proxy_EventArguments_SessionEventArgs_Finalize" data-uid="Titanium.Web.Proxy.EventArguments.SessionEventArgs.Finalize">Finalize()</h4>
412+
<div class="markdown level1 summary"></div>
413+
<div class="markdown level1 conceptual"></div>
414+
<h5 class="decalaration">Declaration</h5>
415+
<div class="codewrapper">
416+
<pre><code class="lang-csharp hljs">protected void Finalize()</code></pre>
417+
</div>
384418
<span class="small pull-right mobile-hide">
385419
<span class="divider">|</span>
386420
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/develop/apiSpec/new?filename=Titanium_Web_Proxy_EventArguments_SessionEventArgs_GenericResponse_System_Byte___System_Net_HttpStatusCode_System_Collections_Generic_IDictionary_System_String_Titanium_Web_Proxy_Models_HttpHeader__System_Boolean_.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.EventArguments.SessionEventArgs.GenericResponse(System.Byte%5B%5D%2CSystem.Net.HttpStatusCode%2CSystem.Collections.Generic.IDictionary%7BSystem.String%2CTitanium.Web.Proxy.Models.HttpHeader%7D%2CSystem.Boolean)%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>

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

Lines changed: 53 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -765,23 +765,69 @@ <h3 id="methods">Methods
765765
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/develop/apiSpec/new?filename=Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_Dispose.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.Dispose%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>
766766
</span>
767767
<span class="small pull-right mobile-hide">
768-
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/develop/src/Titanium.Web.Proxy/EventArguments/SessionEventArgsBase.cs/#L156">View Source</a>
768+
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/develop/src/Titanium.Web.Proxy/EventArguments/SessionEventArgsBase.cs/#L177">View Source</a>
769769
</span>
770770
<a id="Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_Dispose_" data-uid="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.Dispose*"></a>
771771
<h4 id="Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_Dispose" data-uid="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.Dispose">Dispose()</h4>
772-
<div class="markdown level1 summary"><p>Implements cleanup here.</p>
773-
</div>
772+
<div class="markdown level1 summary"></div>
773+
<div class="markdown level1 conceptual"></div>
774+
<h5 class="decalaration">Declaration</h5>
775+
<div class="codewrapper">
776+
<pre><code class="lang-csharp hljs">public void Dispose()</code></pre>
777+
</div>
778+
<span class="small pull-right mobile-hide">
779+
<span class="divider">|</span>
780+
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/develop/apiSpec/new?filename=Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_Dispose_System_Boolean_.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.Dispose(System.Boolean)%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>
781+
</span>
782+
<span class="small pull-right mobile-hide">
783+
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/develop/src/Titanium.Web.Proxy/EventArguments/SessionEventArgsBase.cs/#L155">View Source</a>
784+
</span>
785+
<a id="Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_Dispose_" data-uid="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.Dispose*"></a>
786+
<h4 id="Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_Dispose_System_Boolean_" data-uid="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.Dispose(System.Boolean)">Dispose(Boolean)</h4>
787+
<div class="markdown level1 summary"></div>
788+
<div class="markdown level1 conceptual"></div>
789+
<h5 class="decalaration">Declaration</h5>
790+
<div class="codewrapper">
791+
<pre><code class="lang-csharp hljs">protected virtual void Dispose(bool disposing)</code></pre>
792+
</div>
793+
<h5 class="parameters">Parameters</h5>
794+
<table class="table table-bordered table-striped table-condensed">
795+
<thead>
796+
<tr>
797+
<th>Type</th>
798+
<th>Name</th>
799+
<th>Description</th>
800+
</tr>
801+
</thead>
802+
<tbody>
803+
<tr>
804+
<td><a class="xref" href="https://docs.microsoft.com/dotnet/api/system.boolean">Boolean</a></td>
805+
<td><span class="parametername">disposing</span></td>
806+
<td></td>
807+
</tr>
808+
</tbody>
809+
</table>
810+
<span class="small pull-right mobile-hide">
811+
<span class="divider">|</span>
812+
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/develop/apiSpec/new?filename=Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_Finalize.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.Finalize%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>
813+
</span>
814+
<span class="small pull-right mobile-hide">
815+
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/develop/src/Titanium.Web.Proxy/EventArguments/SessionEventArgsBase.cs/#L183">View Source</a>
816+
</span>
817+
<a id="Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_Finalize_" data-uid="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.Finalize*"></a>
818+
<h4 id="Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_Finalize" data-uid="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.Finalize">Finalize()</h4>
819+
<div class="markdown level1 summary"></div>
774820
<div class="markdown level1 conceptual"></div>
775821
<h5 class="decalaration">Declaration</h5>
776822
<div class="codewrapper">
777-
<pre><code class="lang-csharp hljs">public virtual void Dispose()</code></pre>
823+
<pre><code class="lang-csharp hljs">protected void Finalize()</code></pre>
778824
</div>
779825
<span class="small pull-right mobile-hide">
780826
<span class="divider">|</span>
781827
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/develop/apiSpec/new?filename=Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_TerminateSession.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.TerminateSession%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>
782828
</span>
783829
<span class="small pull-right mobile-hide">
784-
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/develop/src/Titanium.Web.Proxy/EventArguments/SessionEventArgsBase.cs/#L204">View Source</a>
830+
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/develop/src/Titanium.Web.Proxy/EventArguments/SessionEventArgsBase.cs/#L225">View Source</a>
785831
</span>
786832
<a id="Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_TerminateSession_" data-uid="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.TerminateSession*"></a>
787833
<h4 id="Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_TerminateSession" data-uid="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.TerminateSession">TerminateSession()</h4>
@@ -799,7 +845,7 @@ <h3 id="events">Events
799845
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/develop/apiSpec/new?filename=Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_DataReceived.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.DataReceived%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>
800846
</span>
801847
<span class="small pull-right mobile-hide">
802-
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/develop/src/Titanium.Web.Proxy/EventArguments/SessionEventArgsBase.cs/#L175">View Source</a>
848+
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/develop/src/Titanium.Web.Proxy/EventArguments/SessionEventArgsBase.cs/#L196">View Source</a>
803849
</span>
804850
<h4 id="Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_DataReceived" data-uid="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.DataReceived">DataReceived</h4>
805851
<div class="markdown level1 summary"><p>Fired when data is received within this session from client/server.</p>
@@ -829,7 +875,7 @@ <h5 class="eventType">Event Type</h5>
829875
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/new/develop/apiSpec/new?filename=Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_DataSent.md&amp;value=---%0Auid%3A%20Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.DataSent%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>
830876
</span>
831877
<span class="small pull-right mobile-hide">
832-
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/develop/src/Titanium.Web.Proxy/EventArguments/SessionEventArgsBase.cs/#L170">View Source</a>
878+
<a href="https://github.com/justcoding121/Titanium-Web-Proxy/blob/develop/src/Titanium.Web.Proxy/EventArguments/SessionEventArgsBase.cs/#L191">View Source</a>
833879
</span>
834880
<h4 id="Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_DataSent" data-uid="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.DataSent">DataSent</h4>
835881
<div class="markdown level1 summary"><p>Fired when data is sent within this session to server/client.</p>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,9 @@ <h5>Inherited Members</h5>
160160
<div>
161161
<a class="xref" href="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.html#Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_Exception">SessionEventArgsBase.Exception</a>
162162
</div>
163+
<div>
164+
<a class="xref" href="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.html#Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_Dispose_System_Boolean_">SessionEventArgsBase.Dispose(Boolean)</a>
165+
</div>
163166
<div>
164167
<a class="xref" href="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.html#Titanium_Web_Proxy_EventArguments_SessionEventArgsBase_Dispose">SessionEventArgsBase.Dispose()</a>
165168
</div>

0 commit comments

Comments
 (0)