Unverified Commit bfd60793 authored by StephaneGraziano's avatar StephaneGraziano Committed by GitHub

Merge branch 'master' into master

parents 01a997d7 f225e38d
This diff is collapsed.
...@@ -3505,19 +3505,6 @@ references: ...@@ -3505,19 +3505,6 @@ references:
isSpec: "True" isSpec: "True"
fullName: Titanium.Web.Proxy.ProxyServer.EnableTcpServerConnectionPrefetch fullName: Titanium.Web.Proxy.ProxyServer.EnableTcpServerConnectionPrefetch
nameWithType: ProxyServer.EnableTcpServerConnectionPrefetch nameWithType: ProxyServer.EnableTcpServerConnectionPrefetch
- uid: Titanium.Web.Proxy.ProxyServer.EnableThreadPoolOptimizing
name: EnableThreadPoolOptimizing
href: api/Titanium.Web.Proxy.ProxyServer.html#Titanium_Web_Proxy_ProxyServer_EnableThreadPoolOptimizing
commentId: P:Titanium.Web.Proxy.ProxyServer.EnableThreadPoolOptimizing
fullName: Titanium.Web.Proxy.ProxyServer.EnableThreadPoolOptimizing
nameWithType: ProxyServer.EnableThreadPoolOptimizing
- uid: Titanium.Web.Proxy.ProxyServer.EnableThreadPoolOptimizing*
name: EnableThreadPoolOptimizing
href: api/Titanium.Web.Proxy.ProxyServer.html#Titanium_Web_Proxy_ProxyServer_EnableThreadPoolOptimizing_
commentId: Overload:Titanium.Web.Proxy.ProxyServer.EnableThreadPoolOptimizing
isSpec: "True"
fullName: Titanium.Web.Proxy.ProxyServer.EnableThreadPoolOptimizing
nameWithType: ProxyServer.EnableThreadPoolOptimizing
- uid: Titanium.Web.Proxy.ProxyServer.EnableWinAuth - uid: Titanium.Web.Proxy.ProxyServer.EnableWinAuth
name: EnableWinAuth name: EnableWinAuth
href: api/Titanium.Web.Proxy.ProxyServer.html#Titanium_Web_Proxy_ProxyServer_EnableWinAuth href: api/Titanium.Web.Proxy.ProxyServer.html#Titanium_Web_Proxy_ProxyServer_EnableWinAuth
...@@ -3828,6 +3815,19 @@ references: ...@@ -3828,6 +3815,19 @@ references:
isSpec: "True" isSpec: "True"
fullName: Titanium.Web.Proxy.ProxyServer.TcpTimeWaitSeconds fullName: Titanium.Web.Proxy.ProxyServer.TcpTimeWaitSeconds
nameWithType: ProxyServer.TcpTimeWaitSeconds nameWithType: ProxyServer.TcpTimeWaitSeconds
- uid: Titanium.Web.Proxy.ProxyServer.ThreadPoolWorkerThread
name: ThreadPoolWorkerThread
href: api/Titanium.Web.Proxy.ProxyServer.html#Titanium_Web_Proxy_ProxyServer_ThreadPoolWorkerThread
commentId: P:Titanium.Web.Proxy.ProxyServer.ThreadPoolWorkerThread
fullName: Titanium.Web.Proxy.ProxyServer.ThreadPoolWorkerThread
nameWithType: ProxyServer.ThreadPoolWorkerThread
- uid: Titanium.Web.Proxy.ProxyServer.ThreadPoolWorkerThread*
name: ThreadPoolWorkerThread
href: api/Titanium.Web.Proxy.ProxyServer.html#Titanium_Web_Proxy_ProxyServer_ThreadPoolWorkerThread_
commentId: Overload:Titanium.Web.Proxy.ProxyServer.ThreadPoolWorkerThread
isSpec: "True"
fullName: Titanium.Web.Proxy.ProxyServer.ThreadPoolWorkerThread
nameWithType: ProxyServer.ThreadPoolWorkerThread
- uid: Titanium.Web.Proxy.ProxyServer.UpStreamEndPoint - uid: Titanium.Web.Proxy.ProxyServer.UpStreamEndPoint
name: UpStreamEndPoint name: UpStreamEndPoint
href: api/Titanium.Web.Proxy.ProxyServer.html#Titanium_Web_Proxy_ProxyServer_UpStreamEndPoint href: api/Titanium.Web.Proxy.ProxyServer.html#Titanium_Web_Proxy_ProxyServer_UpStreamEndPoint
......
...@@ -72,8 +72,8 @@ ...@@ -72,8 +72,8 @@
<Prefer32Bit>true</Prefer32Bit> <Prefer32Bit>true</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="StreamExtended, Version=1.0.190.0, Culture=neutral, PublicKeyToken=bbfa0f1d54f50043, processorArchitecture=MSIL"> <Reference Include="StreamExtended, Version=1.0.201.0, Culture=neutral, PublicKeyToken=bbfa0f1d54f50043, processorArchitecture=MSIL">
<HintPath>..\..\src\packages\StreamExtended.1.0.190\lib\net45\StreamExtended.dll</HintPath> <HintPath>..\..\src\packages\StreamExtended.1.0.201\lib\net45\StreamExtended.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="StreamExtended" version="1.0.190" targetFramework="net45" /> <package id="StreamExtended" version="1.0.201" targetFramework="net45" />
</packages> </packages>
\ No newline at end of file
...@@ -154,8 +154,13 @@ namespace Titanium.Web.Proxy ...@@ -154,8 +154,13 @@ namespace Titanium.Web.Proxy
if (EnableTcpServerConnectionPrefetch) if (EnableTcpServerConnectionPrefetch)
{ {
//make sure the host can be resolved before creating the prefetch task IPAddress[] ipAddresses = null;
var ipAddresses = await Dns.GetHostAddressesAsync(connectArgs.HttpClient.Request.RequestUri.Host); try
{
//make sure the host can be resolved before creating the prefetch task
ipAddresses = await Dns.GetHostAddressesAsync(connectArgs.HttpClient.Request.RequestUri.Host);
}
catch (SocketException) { }
if (ipAddresses != null && ipAddresses.Length > 0) if (ipAddresses != null && ipAddresses.Length > 0)
{ {
......
...@@ -15,14 +15,14 @@ ...@@ -15,14 +15,14 @@
<tags></tags> <tags></tags>
<dependencies> <dependencies>
<group targetFramework="net45"> <group targetFramework="net45">
<dependency id="StreamExtended" version="1.0.190" /> <dependency id="StreamExtended" version="1.0.201" />
<dependency id="Portable.BouncyCastle" version="1.8.3.37" /> <dependency id="Portable.BouncyCastle" version="1.8.5" />
<dependency id="BrotliSharpLib" version="0.3.1" /> <dependency id="BrotliSharpLib" version="0.3.3" />
</group> </group>
<group targetFramework="netstandard2.0"> <group targetFramework="netstandard2.0">
<dependency id="StreamExtended" version="1.0.190" /> <dependency id="StreamExtended" version="1.0.201" />
<dependency id="Portable.BouncyCastle" version="1.8.3.37" /> <dependency id="Portable.BouncyCastle" version="1.8.5" />
<dependency id="BrotliSharpLib" version="0.3.1" /> <dependency id="BrotliSharpLib" version="0.3.3" />
<dependency id="Microsoft.Win32.Registry" version="4.4.0" /> <dependency id="Microsoft.Win32.Registry" version="4.4.0" />
<dependency id="System.Security.Principal.Windows" version="4.4.1" /> <dependency id="System.Security.Principal.Windows" version="4.4.1" />
</group> </group>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment