diff --git a/.build/build.ps1 b/.build/build.ps1 index f5f517709..655f8ea30 100644 --- a/.build/build.ps1 +++ b/.build/build.ps1 @@ -120,7 +120,7 @@ Task Document -depends Build { git config --global credential.helper store Add-Content "$HOME\.git-credentials" "https://$($env:github_access_token):x-oauth-basic@github.com`n" git config --global user.email $env:github_email - git config --global user.name "buildbot121" + git config --global user.name "buildbot171" git add . -A git commit -m "API documentation update by build server" git push origin master diff --git a/appveyor.yml b/appveyor.yml index 9930bd74d..a6cb1a6ac 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -45,7 +45,7 @@ test_script: skip_tags: true skip_commits: - author: buildbot121 + author: buildbot171 files: - docs/* - .vscode/* @@ -64,9 +64,9 @@ artifacts: environment: github_access_token: - secure: BGdKiI7FwHGkFt+/OmgZDkE1hzLqLrTxcc9c+joVqGyO4LvesHb1sR6hzisVwVPm + secure: mZLeq0GTB9kb5b6+HnVpJB6hhiYMJIQ2+Zf/DwZ/LEIyxJaYB1nx36aGHXE9q1cN github_email: - secure: wvYod3JLufbIBkavRXlCP724wJkhqR2RRuLLaPnqfps= + secure: iBJZGqxyiHVNeYI0uIW+MdGd3I3pg8brJtETNRkKe/A= nuget_access_token: secure: ZbRmjOcp+TDllRV1wxqLZjdRV7hld388rXlWVJuGGiQleomP9Ku+Nsy3a75E7/9k deploy: diff --git a/src/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs b/src/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs index e40f5b34b..8848fc597 100644 --- a/src/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs +++ b/src/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs @@ -385,6 +385,11 @@ private async Task createServerConnection(string remoteHost tcpServerSocket = new Socket(addressFamily, SocketType.Stream, ProtocolType.Tcp); } + if (upStreamEndPoint != null) + { + tcpServerSocket.Bind(upStreamEndPoint); + } + tcpServerSocket.NoDelay = proxyServer.NoDelay; tcpServerSocket.ReceiveTimeout = proxyServer.ConnectionTimeOutSeconds * 1000; tcpServerSocket.SendTimeout = proxyServer.ConnectionTimeOutSeconds * 1000;