feat(httpd): configurable http read timeout

HTTP read timeout is useful to avoid half-open connections due to
bad network.
See #15410.

Author: foobar

services/httpd/config.go

@@ -64,6 +64,7 @@ type Config struct {
 	MaxEnqueuedWriteLimit   int               `toml:"max-enqueued-write-limit"`
 	EnqueuedWriteTimeout    time.Duration     `toml:"enqueued-write-timeout"`
 	TLS                     *tls.Config       `toml:"-"`
+	ReadTimeout             time.Duration     `toml:"read-timeout"`
 }
 
 // NewConfig returns a new Config with default settings.

services/httpd/service.go

@@ -65,6 +65,8 @@ type Service struct {
 	Handler *Handler
 
 	Logger *zap.Logger
+
+	ReadTimeout time.Duration
 }
 
 // NewService returns a new instance of Service.
@@ -82,6 +84,7 @@ func NewService(c Config) *Service {
 		bindSocket:     c.BindSocket,
 		Handler:        NewHandler(c),
 		Logger:         zap.NewNop(),
+		ReadTimeout:    c.ReadTimeout,
 	}
 	if s.tlsConfig == nil {
 		s.tlsConfig = new(tls.Config)
@@ -246,7 +249,7 @@ func (s *Service) serveUnixSocket() {
 func (s *Service) serve(listener net.Listener) {
 	// The listener was closed so exit
 	// See https://github.com/golang/go/issues/4373
-	err := http.Serve(listener, s.Handler)
+	err := (&http.Server{Handler: s.Handler, ReadTimeout: s.ReadTimeout}).Serve(listener)
 	if err != nil && !strings.Contains(err.Error(), "closed") {
 		s.err <- fmt.Errorf("listener failed: addr=%s, err=%s", s.Addr(), err)
 	}