Merge pull request #60 from tomtaylor/gofmt-fixes

Run gofmt over source
This commit is contained in:
Jehiah Czebotar 2015-01-19 12:48:57 -05:00
commit 601ae6f4ec
2 changed files with 5 additions and 5 deletions

View File

@ -10,9 +10,9 @@ import (
"net/http" "net/http"
"net/http/httputil" "net/http/httputil"
"net/url" "net/url"
"regexp"
"strings" "strings"
"time" "time"
"regexp"
"github.com/bitly/go-simplejson" "github.com/bitly/go-simplejson"
) )
@ -86,7 +86,7 @@ func NewOauthProxy(opts *Options, validator func(string) bool) *OauthProxy {
serveMux: serveMux, serveMux: serveMux,
redirectUrl: redirectUrl, redirectUrl: redirectUrl,
skipAuthRegex: opts.SkipAuthRegex, skipAuthRegex: opts.SkipAuthRegex,
compiledRegex: opts.CompiledRegex, compiledRegex: opts.CompiledRegex,
PassBasicAuth: opts.PassBasicAuth, PassBasicAuth: opts.PassBasicAuth,
} }
} }

View File

@ -4,8 +4,8 @@ import (
"errors" "errors"
"fmt" "fmt"
"net/url" "net/url"
"time"
"regexp" "regexp"
"time"
) )
// Configuration Options that can be set by Command Line Flag, or Config File // Configuration Options that can be set by Command Line Flag, or Config File
@ -28,8 +28,8 @@ type Options struct {
SkipAuthRegex []string `flag:"skip-auth-regex" cfg:"skip_auth_regex"` SkipAuthRegex []string `flag:"skip-auth-regex" cfg:"skip_auth_regex"`
// internal values that are set after config validation // internal values that are set after config validation
redirectUrl *url.URL redirectUrl *url.URL
proxyUrls []*url.URL proxyUrls []*url.URL
CompiledRegex []*regexp.Regexp CompiledRegex []*regexp.Regexp
} }