From f8533cd6daca27c086d78bab796d72cd39fe0eaf Mon Sep 17 00:00:00 2001 From: Jehonathan Thomas Date: Wed, 25 Dec 2019 22:19:34 -0700 Subject: [PATCH 1/3] update buildbot cred --- .build/build.ps1 | 2 +- appveyor.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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..3a9570849 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,7 +64,7 @@ artifacts: environment: github_access_token: - secure: BGdKiI7FwHGkFt+/OmgZDkE1hzLqLrTxcc9c+joVqGyO4LvesHb1sR6hzisVwVPm + secure: mZLeq0GTB9kb5b6+HnVpJB6hhiYMJIQ2+Zf/DwZ/LEIyxJaYB1nx36aGHXE9q1cN github_email: secure: wvYod3JLufbIBkavRXlCP724wJkhqR2RRuLLaPnqfps= nuget_access_token: From b8e91fe4c80f1378cf1c4c85455cd5a39479b687 Mon Sep 17 00:00:00 2001 From: Jehonathan Thomas Date: Wed, 25 Dec 2019 22:28:38 -0700 Subject: [PATCH 2/3] update buildbot171 email --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 3a9570849..a6cb1a6ac 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -66,7 +66,7 @@ environment: github_access_token: secure: mZLeq0GTB9kb5b6+HnVpJB6hhiYMJIQ2+Zf/DwZ/LEIyxJaYB1nx36aGHXE9q1cN github_email: - secure: wvYod3JLufbIBkavRXlCP724wJkhqR2RRuLLaPnqfps= + secure: iBJZGqxyiHVNeYI0uIW+MdGd3I3pg8brJtETNRkKe/A= nuget_access_token: secure: ZbRmjOcp+TDllRV1wxqLZjdRV7hld388rXlWVJuGGiQleomP9Ku+Nsy3a75E7/9k deploy: From e4527c0ad7ff614b35dce608e598f929651c9706 Mon Sep 17 00:00:00 2001 From: Honfika Date: Thu, 26 Dec 2019 08:50:44 +0100 Subject: [PATCH 3/3] fox for #716 --- src/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs | 5 +++++ 1 file changed, 5 insertions(+) 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;