darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #574 from scrapinghub/bugfix-endlessloop

Browse source 
Detect https scheme when serving ssl
This commit is contained in:
Brad Rydzewski 2014-10-15 08:23:56 -07:00
commit b69a62b488
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
shared/httputil/httputil.go
View file

@ -13,6 +13,8 @@ func IsHttps(r *http.Request) bool {
switch { switch {
case r.URL.Scheme == "https": case r.URL.Scheme == "https":
return true return true
case r.TLS != nil:
return true
case strings.HasPrefix(r.Proto, "HTTPS"): case strings.HasPrefix(r.Proto, "HTTPS"):
return true return true
case r.Header.Get("X-Forwarded-Proto") == "https": case r.Header.Get("X-Forwarded-Proto") == "https":
@ -30,6 +32,8 @@ func GetScheme(r *http.Request) string {
switch { switch {
case r.URL.Scheme == "https": case r.URL.Scheme == "https":
return "https" return "https"
case r.TLS != nil:
return "https"
case strings.HasPrefix(r.Proto, "HTTPS"): case strings.HasPrefix(r.Proto, "HTTPS"):
return "https" return "https"
case r.Header.Get("X-Forwarded-Proto") == "https": case r.Header.Get("X-Forwarded-Proto") == "https":