github-starred/frp
2
0
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2026-05-15 16:15:49 -06:00
Code Issues 40 Projects Packages Wiki Activity Actions 1

plugin: fix http2 not enabled for https2http and https2https plugin (#4230)

Browse source
This commit is contained in:
fatedier 2024-05-21 11:26:52 +08:00 • committed by GitHub
parent 9ced717d69
commit f0442d0cd5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pkg/plugin/client/https2https.go
View file

@ -78,11 +78,6 @@ func NewHTTPS2HTTPSPlugin(options v1.ClientPluginOptions) (Plugin, error) {
ErrorLog: stdlog.New(log.NewWriteLogger(log.WarnLevel, 2), "", 0),
}
p.s = &http.Server{
Handler: rp,
ReadHeaderTimeout: 60 * time.Second,
}
var (
tlsConfig *tls.Config
err error
@ -96,10 +91,15 @@ func NewHTTPS2HTTPSPlugin(options v1.ClientPluginOptions) (Plugin, error) {
if err != nil {
return nil, fmt.Errorf("gen TLS config error: %v", err)
}
ln := tls.NewListener(listener, tlsConfig)
p.s = &http.Server{
Handler: rp,
ReadHeaderTimeout: 60 * time.Second,
TLSConfig: tlsConfig,
}
go func() {
_ = p.s.Serve(ln)
_ = p.s.ServeTLS(listener, "", "")
}()
return p, nil
}