Add timeout to writing to responses (#15831)
In #15826 it has become apparent that there are a few occasions when a response can hang during writing, and because there is no timeout go will happily just block interminably. This PR adds a fixed 5 second timeout to all writes to a connection. Fix #15826 Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
		
							parent
							
								
									2d87a84709
								
							
						
					
					
						commit
						1a5659943e
					
				
					 1 changed files with 10 additions and 0 deletions
				
			
		|  | @ -28,6 +28,9 @@ var ( | |||
| 	DefaultMaxHeaderBytes int | ||||
| ) | ||||
| 
 | ||||
| // PerWriteWriteTimeout timeout for writes
 | ||||
| const PerWriteWriteTimeout = 5 * time.Second | ||||
| 
 | ||||
| func init() { | ||||
| 	DefaultMaxHeaderBytes = 0 // use http.DefaultMaxHeaderBytes - which currently is 1 << 20 (1MB)
 | ||||
| } | ||||
|  | @ -250,6 +253,13 @@ type wrappedConn struct { | |||
| 	closed *int32 | ||||
| } | ||||
| 
 | ||||
| func (w wrappedConn) Write(p []byte) (n int, err error) { | ||||
| 	if PerWriteWriteTimeout > 0 { | ||||
| 		_ = w.Conn.SetWriteDeadline(time.Now().Add(PerWriteWriteTimeout)) | ||||
| 	} | ||||
| 	return w.Conn.Write(p) | ||||
| } | ||||
| 
 | ||||
| func (w wrappedConn) Close() error { | ||||
| 	if atomic.CompareAndSwapInt32(w.closed, 0, 1) { | ||||
| 		defer func() { | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue