Merge pull request #470 from justcoding121/master

Beta

Author: justcoding121

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

@@ -273,9 +273,7 @@ private async Task<TcpServerConnection> createServerConnection(string remoteHost
                     SendTimeout = proxyServer.ConnectionTimeOutSeconds * 1000,
                     SendBufferSize = proxyServer.BufferSize,
                     ReceiveBufferSize = proxyServer.BufferSize
-                };
-
-                await proxyServer.InvokeConnectionCreateEvent(tcpClient, false);
+                }; 
 
                 // If this proxy uses another external proxy then create a tunnel request for HTTP/HTTPS connections
                 if (useUpstreamProxy)
@@ -287,6 +285,8 @@ private async Task<TcpServerConnection> createServerConnection(string remoteHost
                     await tcpClient.ConnectAsync(remoteHostName, remotePort);
                 }
 
+                await proxyServer.InvokeConnectionCreateEvent(tcpClient, false);
+
                 stream = new CustomBufferedStream(tcpClient.GetStream(), proxyServer.BufferPool, proxyServer.BufferSize);
 
                 if (useUpstreamProxy && (isConnect || isHttps))

docs/api/Titanium.Web.Proxy.ProxyServer.html

@@ -647,7 +647,7 @@ <h4 id="Titanium_Web_Proxy_ProxyServer_ProxyBasicAuthenticateFunc" data-uid="Tit
   <div class="markdown level1 conceptual"></div>
   <h5 class="decalaration">Declaration</h5>
   <div class="codewrapper">
-    <pre><code class="lang-csharp hljs">public Func&lt;string, string, Task&lt;bool&gt;&gt; ProxyBasicAuthenticateFunc { get; set; }</code></pre>
+    <pre><code class="lang-csharp hljs">public Func&lt;SessionEventArgsBase, string, string, Task&lt;bool&gt;&gt; ProxyBasicAuthenticateFunc { get; set; }</code></pre>
   </div>
   <h5 class="propertyValue">Property Value</h5>
   <table class="table table-bordered table-striped table-condensed">
@@ -659,7 +659,7 @@ <h5 class="propertyValue">Property Value</h5>
     </thead>
     <tbody>
       <tr>
-        <td><a class="xref" href="https://docs.microsoft.com/dotnet/api/system.func-3">Func</a>&lt;<a class="xref" href="https://docs.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://docs.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://docs.microsoft.com/dotnet/api/system.threading.tasks.task-1">Task</a>&lt;<a class="xref" href="https://docs.microsoft.com/dotnet/api/system.boolean">Boolean</a>&gt;&gt;</td>
+        <td><a class="xref" href="https://docs.microsoft.com/dotnet/api/system.func-4">Func</a>&lt;<a class="xref" href="Titanium.Web.Proxy.EventArguments.SessionEventArgsBase.html">SessionEventArgsBase</a>, <a class="xref" href="https://docs.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://docs.microsoft.com/dotnet/api/system.string">String</a>, <a class="xref" href="https://docs.microsoft.com/dotnet/api/system.threading.tasks.task-1">Task</a>&lt;<a class="xref" href="https://docs.microsoft.com/dotnet/api/system.boolean">Boolean</a>&gt;&gt;</td>
         <td></td>
       </tr>
     </tbody>