Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-05-31 20:24:18 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

reverseproxy: Minor tweaks

Browse Source 
We'll need that context in v2.1 when the transport can manage its own
client certificates; see #3198
This commit is contained in:
Matthew Holt 2020-04-09 13:22:05 -06:00
parent 85f5f47f31
commit f29023bf8f
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/caddyhttp/reverseproxy/command.go
View File

@ -121,7 +121,7 @@ func cmdReverseProxy(fs caddycmd.Flags) (int, error) {
urlHost := fromURL.Hostname() urlHost := fromURL.Hostname()
if urlHost != "" { if urlHost != "" {
route.MatcherSetsRaw = []caddy.ModuleMap{ route.MatcherSetsRaw = []caddy.ModuleMap{
caddy.ModuleMap{ {
"host": caddyconfig.JSON(caddyhttp.MatchHost{urlHost}, nil), "host": caddyconfig.JSON(caddyhttp.MatchHost{urlHost}, nil),
}, },
} }

6
modules/caddyhttp/reverseproxy/httptransport.go
View File

@ -99,12 +99,12 @@ func (HTTPTransport) CaddyModule() caddy.ModuleInfo {
// Provision sets up h.Transport with a *http.Transport // Provision sets up h.Transport with a *http.Transport
// that is ready to use. // that is ready to use.
func (h *HTTPTransport) Provision(_ caddy.Context) error { func (h *HTTPTransport) Provision(ctx caddy.Context) error {
if len(h.Versions) == 0 { if len(h.Versions) == 0 {
h.Versions = []string{"1.1", "2"} h.Versions = []string{"1.1", "2"}
} }
rt, err := h.NewTransport() rt, err := h.NewTransport(ctx)
if err != nil { if err != nil {
return err return err
} }
@ -115,7 +115,7 @@ func (h *HTTPTransport) Provision(_ caddy.Context) error {
// NewTransport builds a standard-lib-compatible // NewTransport builds a standard-lib-compatible
// http.Transport value from h. // http.Transport value from h.
func (h *HTTPTransport) NewTransport() (*http.Transport, error) { func (h *HTTPTransport) NewTransport(_ caddy.Context) (*http.Transport, error) {
dialer := &net.Dialer{ dialer := &net.Dialer{
Timeout: time.Duration(h.DialTimeout), Timeout: time.Duration(h.DialTimeout),
FallbackDelay: time.Duration(h.FallbackDelay), FallbackDelay: time.Duration(h.FallbackDelay),