Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enable h2c for vhost server #4582

Merged
merged 1 commit into from
Dec 13, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pkg/util/vhost/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ import (

libio "github.com/fatedier/golib/io"
"github.com/fatedier/golib/pool"
"golang.org/x/net/http2"
"golang.org/x/net/http2/h2c"

httppkg "github.com/fatedier/frp/pkg/util/http"
"github.com/fatedier/frp/pkg/util/log"
Expand All @@ -41,7 +43,7 @@ type HTTPReverseProxyOptions struct {
}

type HTTPReverseProxy struct {
proxy *httputil.ReverseProxy
proxy http.Handler
vhostRouter *Routers

responseHeaderTimeout time.Duration
Expand Down Expand Up @@ -138,7 +140,7 @@ func NewHTTPReverseProxy(option HTTPReverseProxyOptions, vhostRouter *Routers) *
_, _ = rw.Write(getNotFoundPageContent())
},
}
rp.proxy = proxy
rp.proxy = h2c.NewHandler(proxy, &http2.Server{})
return rp
}

Expand Down
Loading