diff --git a/config/load.go b/config/load.go index aa6cfda26..72b2b70e4 100644 --- a/config/load.go +++ b/config/load.go @@ -247,7 +247,7 @@ func load(cmdline, environ, envprefix []string, props *properties.Properties) (c return nil, fmt.Errorf("invalid proxy.strategy: %s", cfg.Proxy.Strategy) } - if cfg.Proxy.Matcher != "prefix" && cfg.Proxy.Matcher != "glob" && cfg.Proxy.Matcher != "nocase" { + if cfg.Proxy.Matcher != "prefix" && cfg.Proxy.Matcher != "glob" && cfg.Proxy.Matcher != "iprefix" { return nil, fmt.Errorf("invalid proxy.matcher: %s", cfg.Proxy.Matcher) } diff --git a/config/load_test.go b/config/load_test.go index 8f3150548..29fb9682a 100644 --- a/config/load_test.go +++ b/config/load_test.go @@ -307,9 +307,9 @@ func TestLoad(t *testing.T) { }, }, { - args: []string{"-proxy.matcher", "nocase"}, + args: []string{"-proxy.matcher", "iprefix"}, cfg: func(cfg *Config) *Config { - cfg.Proxy.Matcher = "nocase" + cfg.Proxy.Matcher = "iprefix" return cfg }, }, diff --git a/docs/content/ref/proxy.matcher.md b/docs/content/ref/proxy.matcher.md index 38af329e7..dea344fef 100644 --- a/docs/content/ref/proxy.matcher.md +++ b/docs/content/ref/proxy.matcher.md @@ -19,7 +19,7 @@ function. For example, `/foo*` matches `/foo`, `/fool` and `/fools`. Also, `/foo/*/bar` matches `/foo/x/bar`. -`nocase` matching is similar to `prefix`, except it uses a case insensitive comparison +`iprefix` matching is similar to `prefix`, except it uses a case insensitive comparison The default is diff --git a/fabio.properties b/fabio.properties index 4887267d8..42177a9fc 100644 --- a/fabio.properties +++ b/fabio.properties @@ -297,7 +297,7 @@ # # prefix: prefix matching # glob: glob matching -# nocase: matches using a case insensitive test +# iprefix: case-insensitive prefix matching # # The default is # diff --git a/route/matcher.go b/route/matcher.go index dd951ce49..e1e817641 100644 --- a/route/matcher.go +++ b/route/matcher.go @@ -10,9 +10,9 @@ type matcher func(uri string, r *Route) bool // Matcher contains the available matcher functions. // Update config/load.go#load after updating. var Matcher = map[string]matcher{ - "prefix": prefixMatcher, - "glob": globMatcher, - "nocase": noCaseMatcher, + "prefix": prefixMatcher, + "glob": globMatcher, + "iprefix": iPrefixMatcher, } // prefixMatcher matches path to the routes' path. @@ -25,8 +25,8 @@ func globMatcher(uri string, r *Route) bool { return r.Glob.Match(uri) } -// noCase matches path to the routes' path ignoring case -func noCaseMatcher(uri string, r *Route) bool { +// iPrefixMatcher matches path to the routes' path ignoring case +func iPrefixMatcher(uri string, r *Route) bool { lowerURI := strings.ToLower(uri) lowerPath := strings.ToLower(r.Path) return strings.HasPrefix(lowerURI, lowerPath) diff --git a/route/matcher_test.go b/route/matcher_test.go index 89284bbd9..163be120d 100644 --- a/route/matcher_test.go +++ b/route/matcher_test.go @@ -61,7 +61,7 @@ func TestGlobMatcher(t *testing.T) { } } -func TestNoCaseMatcher(t *testing.T) { +func TestIPrefixMatcher(t *testing.T) { tests := []struct { uri string matches bool @@ -75,7 +75,7 @@ func TestNoCaseMatcher(t *testing.T) { for _, tt := range tests { t.Run(tt.uri, func(t *testing.T) { - if got, want := noCaseMatcher(tt.uri, tt.route), tt.matches; got != want { + if got, want := iPrefixMatcher(tt.uri, tt.route), tt.matches; got != want { t.Fatalf("got %v want %v", got, want) } })