lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

credit go std lib

Browse Source
This commit is contained in:
risk danger olson 2016-07-11 15:59:16 -06:00 committed by GitHub
parent 1392d49d55
commit 146cdcf728
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
httputil/proxy.go
View File

@ -11,6 +11,7 @@ import (
"github.com/github/git-lfs/config" "github.com/github/git-lfs/config"
) )
// Logic is copied, with small changes, from "net/http".ProxyFromEnvironment in the go std lib.
func ProxyFromGitConfigOrEnvironment(c *config.Configuration) func(req *http.Request) (*url.URL, error) { func ProxyFromGitConfigOrEnvironment(c *config.Configuration) func(req *http.Request) (*url.URL, error) {
https_proxy := c.Getenv("HTTPS_PROXY") https_proxy := c.Getenv("HTTPS_PROXY")
if len(https_proxy) == 0 { if len(https_proxy) == 0 {
@ -66,6 +67,7 @@ func ProxyFromGitConfigOrEnvironment(c *config.Configuration) func(req *http.Req
} }
// canonicalAddr returns url.Host but always with a ":port" suffix // canonicalAddr returns url.Host but always with a ":port" suffix
// Copied from "net/http".ProxyFromEnvironment in the go std lib.
func canonicalAddr(url *url.URL) string { func canonicalAddr(url *url.URL) string {
addr := url.Host addr := url.Host
if !hasPort(addr) { if !hasPort(addr) {
@ -77,6 +79,7 @@ func canonicalAddr(url *url.URL) string {
// useProxy reports whether requests to addr should use a proxy, // useProxy reports whether requests to addr should use a proxy,
// according to the NO_PROXY or no_proxy environment variable. // according to the NO_PROXY or no_proxy environment variable.
// addr is always a canonicalAddr with a host and port. // addr is always a canonicalAddr with a host and port.
// Copied from "net/http".ProxyFromEnvironment in the go std lib.
func useProxy(no_proxy, addr string) bool { func useProxy(no_proxy, addr string) bool {
if len(addr) == 0 { if len(addr) == 0 {
return true return true
@ -129,6 +132,7 @@ func useProxy(no_proxy, addr string) bool {
// Given a string of the form "host", "host:port", or "[ipv6::address]:port", // Given a string of the form "host", "host:port", or "[ipv6::address]:port",
// return true if the string includes a port. // return true if the string includes a port.
// Copied from "net/http".ProxyFromEnvironment in the go std lib.
func hasPort(s string) bool { return strings.LastIndex(s, ":") > strings.LastIndex(s, "]") } func hasPort(s string) bool { return strings.LastIndex(s, ":") > strings.LastIndex(s, "]") }
var ( var (