cotugno/syncthing
2
Fork 0
mirror of https://github.com/syncthing/syncthing.git synced 2024-11-17 02:48:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2126 from AudriusButkevicius/peek

Browse Source 
Add timeout for peek (fixes #1035)
This commit is contained in:
Jakob Borg 2015-08-07 17:30:54 +02:00
commit d75d162058
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/syncthing/tls.go
View File

@ -102,7 +102,9 @@ func (l *DowngradingListener) Accept() (net.Conn, error) {
}
br := bufio.NewReader(conn)
conn.SetReadDeadline(time.Now().Add(1 * time.Second))
bs, err := br.Peek(1)
conn.SetReadDeadline(time.Time{})
if err != nil {
// We hit a read error here, but the Accept() call succeeded so we must not return an error.
// We return the connection as is and let whoever tries to use it deal with the error.