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

beta #717

Merged
merged 4 commits into from
Dec 26, 2019
Merged

beta #717

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .build/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ Task Document -depends Build {
git config --global credential.helper store
Add-Content "$HOME\.git-credentials" "https://$($env:github_access_token):[email protected]`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
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ test_script:
skip_tags: true

skip_commits:
author: buildbot121
author: buildbot171
files:
- docs/*
- .vscode/*
Expand All @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions src/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,11 @@ private async Task<TcpServerConnection> 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;
Expand Down