Merge branch 'master' into manualconfig

staaldraad · web-flow · commit afa66ee5a8a8 · 2017-05-11T15:03:21.000+01:00
diff --git a/autodiscover/autodiscover.go b/autodiscover/autodiscover.go
@@ -389,6 +389,7 @@ func redirectAutodiscover(redirdom string) (string, error) {
 	return resp.Header.Get("Location"), nil
 }
 
+
 //InsecureRedirectsO365 allows forwarding the Authorization header even when we shouldn't
 type InsecureRedirectsO365 struct {
 	Transport http.RoundTripper

Original file line number	Diff line number	Diff line change
`@@ -389,6 +389,7 @@ func redirectAutodiscover(redirdom string) (string, error) {`
`389`	`389`	`return resp.Header.Get("Location"), nil`
`390`	`390`	`}`
`391`	`391`
	`392`	`+`
`392`	`393`	`//InsecureRedirectsO365 allows forwarding the Authorization header even when we shouldn't`
`393`	`394`	`type InsecureRedirectsO365 struct {`
`394`	`395`	`Transport http.RoundTripper`