Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.

Fix using http2 between TO and TM when setting proxy #3927

Merged
ocket8888 merged 2 commits into from
Sep 25, 2019
Merged

Fix using http2 between TO and TM when setting proxy #3927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
911c9a9
Fix using http2 between TO and TM when setting proxy
mhoppa Sep 17, 2019
945430f
Merge branch 'master' into bug/to_tm_http2
mhoppa Sep 25, 2019
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
10 changes: 9 additions & 1 deletion traffic_ops/traffic_ops_golang/cachesstats/cachesstats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package cachesstats
*/

import (
"crypto/tls"
"database/sql"
"encoding/json"
"errors"
Expand Down Expand Up @@ -66,7 +67,14 @@ func getCachesStats(tx *sql.Tx) ([]CacheData, error) {
if err != nil {
return nil, errors.New("monitor forward proxy '" + monitorForwardProxy + "' in parameter '" + MonitorProxyParameter + "' not a URI: " + err.Error())
}
client = &http.Client{Timeout: MonitorRequestTimeout, Transport: &http.Transport{Proxy: http.ProxyURL(proxyURI)}}
clientTransport := &http.Transport{Proxy: http.ProxyURL(proxyURI)}
if proxyURI.Scheme == "https" {
// TM does not support HTTP/2 and golang when connecting to https will use HTTP/2 by default causing a conflict
// The result will be an unsupported scheme error
// Setting TLSNextProto to any empty map will disable using HTTP/2 per https://golang.org/src/net/http/doc.go
clientTransport.TLSNextProto = make(map[string]func(authority string, c *tls.Conn) http.RoundTripper)
}
client = &http.Client{Timeout: MonitorRequestTimeout, Transport: clientTransport}
}

cacheData, err := getCacheData(tx)
Expand Down
10 changes: 9 additions & 1 deletion traffic_ops/traffic_ops_golang/cdn/capacity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package cdn
*/

import (
"crypto/tls"
"database/sql"
"encoding/json"
"errors"
Expand Down Expand Up @@ -105,7 +106,14 @@ func getMonitorsCapacity(tx *sql.Tx, monitors map[tc.CDNName][]string) (Capacity
if err != nil {
return CapacityResp{}, errors.New("monitor forward proxy '" + monitorForwardProxy + "' in parameter '" + MonitorProxyParameter + "' not a URI: " + err.Error())
}
client = &http.Client{Timeout: MonitorRequestTimeout, Transport: &http.Transport{Proxy: http.ProxyURL(proxyURI)}}
clientTransport := &http.Transport{Proxy: http.ProxyURL(proxyURI)}
if proxyURI.Scheme == "https" {
// TM does not support HTTP/2 and golang when connecting to https will use HTTP/2 by default causing a conflict
// The result will be an unsupported scheme error
// Setting TLSNextProto to any empty map will disable using HTTP/2 per https://golang.org/src/net/http/doc.go
clientTransport.TLSNextProto = make(map[string]func(authority string, c *tls.Conn) http.RoundTripper)
}
client = &http.Client{Timeout: MonitorRequestTimeout, Transport: clientTransport}
}

thresholds, err := getEdgeProfileHealthThresholdBandwidth(tx)
Expand Down