serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-22 10:25:46 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

httpserver: Remove unused ReadTimeout from tlsHelloListener

Browse source
This commit is contained in:
Matthew Holt 2017-02-21 21:51:07 -07:00
parent a2c410b8e1
commit ccdc28631a
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
caddyhttp/httpserver/mitm.go
View file

@ -9,7 +9,6 @@ import (
"net/http" "net/http"
"strings" "strings"
"sync" "sync"
"time"
) )
// tlsHandler is a http.Handler that will inject a value // tlsHandler is a http.Handler that will inject a value
@ -253,12 +252,11 @@ func parseRawClientHello(data []byte) (info rawHelloInfo) {
} }
// newTLSListener returns a new tlsHelloListener that wraps ln. // newTLSListener returns a new tlsHelloListener that wraps ln.
func newTLSListener(ln net.Listener, config *tls.Config, readTimeout time.Duration) *tlsHelloListener { func newTLSListener(ln net.Listener, config *tls.Config) *tlsHelloListener {
return &tlsHelloListener{ return &tlsHelloListener{
Listener: ln, Listener: ln,
config: config, config: config,
readTimeout: readTimeout, helloInfos: make(map[string]rawHelloInfo),
helloInfos: make(map[string]rawHelloInfo),
} }
} }
@ -270,7 +268,6 @@ func newTLSListener(ln net.Listener, config *tls.Config, readTimeout time.Durati
type tlsHelloListener struct { type tlsHelloListener struct {
net.Listener net.Listener
config *tls.Config config *tls.Config
readTimeout time.Duration
helloInfos map[string]rawHelloInfo helloInfos map[string]rawHelloInfo
helloInfosMu sync.RWMutex helloInfosMu sync.RWMutex
} }

2
caddyhttp/httpserver/server.go
View file

@ -247,7 +247,7 @@ func (s *Server) Serve(ln net.Listener) error {
// not implement the File() method we need for graceful restarts // not implement the File() method we need for graceful restarts
// on POSIX systems. // on POSIX systems.
// TODO: Is this ^ still relevant anymore? Maybe we can now that it's a net.Listener... // TODO: Is this ^ still relevant anymore? Maybe we can now that it's a net.Listener...
ln = newTLSListener(ln, s.Server.TLSConfig, s.Server.ReadTimeout) ln = newTLSListener(ln, s.Server.TLSConfig)
if handler, ok := s.Server.Handler.(*tlsHandler); ok { if handler, ok := s.Server.Handler.(*tlsHandler); ok {
handler.listener = ln.(*tlsHelloListener) handler.listener = ln.(*tlsHelloListener)
} }