diff options
| author | Pablo Carranza <pcarranza@gmail.com> | 2016-12-20 16:53:26 +0300 |
|---|---|---|
| committer | Pablo Carranza <pcarranza@gmail.com> | 2016-12-20 16:53:26 +0300 |
| commit | e1ed0d21e77c4c0b7e24948c5bd11f4e0ecff8b0 (patch) | |
| tree | 81d50f2b3c5fb1ac8fbdfb626496de8795bb9ce0 | |
| parent | b549c388d3f72439f4f3653f2cd14f54a2c31eae (diff) | |
| parent | 8aafc68e255c9b9ce80f1b9258ff3276b332c374 (diff) | |
Merge branch 'fix/extend-server-conn-deadline-after-write' into 'master'
Extend server connection deadline after it writes a response
... or else we timeout when sending a large response (e.g.`git-upload-archive`)
See merge request !14
| -rw-r--r-- | server/server.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/server/server.go b/server/server.go index 83b88e67f..18f68531a 100644 --- a/server/server.go +++ b/server/server.go @@ -86,6 +86,8 @@ func (s *Server) serve(conn *net.TCPConn, chans *commChans) { log.Println(err) return } + + conn.SetDeadline(time.Now().Add(1e9)) } }() |