git.iko.soy/typeable/oauth2-proxy
on master help sign in
Merge branch 'master' into docFormat
commit7e3ad6b21501ddfa8b2de1976edc633203f2a978 authorJoel Speed <Joel.speed@hotmail.co.uk> dateWed 14 Aug 2019, 11:12 (7 years ago) parent272fb969240538
2 files changed+3−3
main.go+2−2 oauthproxy.go+1−1
main.go+2−2
@@ -86,8 +86,8 @@ func main() {
8686 flagSet.String("session-store-type", "cookie", "the session storage provider to use")
8787 flagSet.String("redis-connection-url", "", "URL of redis server for redis session storage (eg: redis://HOST[:PORT])")
8888 flagSet.Bool("redis-use-sentinel", false, "Connect to redis via sentinels. Must set --redis-sentinel-master-name and --redis-sentinel-connection-urls to use this feature")
89− flagSet.String("redis-sentinel-master-name", "", "Redis sentinel master name. Used in conjuction with --redis-use-sentinel")
90− flagSet.Var(&redisSentinelConnectionURLs, "redis-sentinel-connection-urls", "List of Redis sentinel connection URLs (eg redis://HOST[:PORT]). Used in conjuction with --redis-use-sentinel")
89+ flagSet.String("redis-sentinel-master-name", "", "Redis sentinel master name. Used in conjunction with --redis-use-sentinel")
90+ flagSet.Var(&redisSentinelConnectionURLs, "redis-sentinel-connection-urls", "List of Redis sentinel connection URLs (eg redis://HOST[:PORT]). Used in conjunction with --redis-use-sentinel")
9191
9292 flagSet.String("logging-filename", "", "File to log requests to, empty for stdout")
9393 flagSet.Int("logging-max-size", 100, "Maximum size in megabytes of the log file before rotation")
oauthproxy.go+1−1
@@ -898,7 +898,7 @@ func isAjax(req *http.Request) bool {
898898 return false
899899}
900900
901−// ErrorJSON returns the error code witht an application/json mime type
901+// ErrorJSON returns the error code with an application/json mime type
902902func (p *OAuthProxy) ErrorJSON(rw http.ResponseWriter, code int) {
903903 rw.Header().Set("Content-Type", applicationJSON)
904904 rw.WriteHeader(code)