summaryrefslogtreecommitdiff
path: root/vendor/github.com
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-09-02 13:05:57 -0400
committerGitHub <noreply@github.com>2020-09-02 13:05:57 -0400
commit37791d717f85c0621932aa18cd4c2477426a2de0 (patch)
treeb4df8c4fc717d77e524aa28a6c02a1fb8241f54a /vendor/github.com
parent1184cdf03d8464451d36b24643e57b65a8b97980 (diff)
parent270c02f3089fa1883eec35fb68f71d2625528534 (diff)
downloadpodman-37791d717f85c0621932aa18cd4c2477426a2de0.tar.gz
podman-37791d717f85c0621932aa18cd4c2477426a2de0.tar.bz2
podman-37791d717f85c0621932aa18cd4c2477426a2de0.zip
Merge pull request #7422 from containers/dependabot/go_modules/github.com/gorilla/mux-1.8.0
Bump github.com/gorilla/mux from 1.7.4 to 1.8.0
Diffstat (limited to 'vendor/github.com')
-rw-r--r--vendor/github.com/gorilla/mux/mux.go3
-rw-r--r--vendor/github.com/gorilla/mux/regexp.go6
2 files changed, 7 insertions, 2 deletions
diff --git a/vendor/github.com/gorilla/mux/mux.go b/vendor/github.com/gorilla/mux/mux.go
index c9ba64707..782a34b22 100644
--- a/vendor/github.com/gorilla/mux/mux.go
+++ b/vendor/github.com/gorilla/mux/mux.go
@@ -435,8 +435,7 @@ func Vars(r *http.Request) map[string]string {
// CurrentRoute returns the matched route for the current request, if any.
// This only works when called inside the handler of the matched route
// because the matched route is stored in the request context which is cleared
-// after the handler returns, unless the KeepContext option is set on the
-// Router.
+// after the handler returns.
func CurrentRoute(r *http.Request) *Route {
if rv := r.Context().Value(routeKey); rv != nil {
return rv.(*Route)
diff --git a/vendor/github.com/gorilla/mux/regexp.go b/vendor/github.com/gorilla/mux/regexp.go
index 96dd94ad1..0144842bb 100644
--- a/vendor/github.com/gorilla/mux/regexp.go
+++ b/vendor/github.com/gorilla/mux/regexp.go
@@ -325,6 +325,12 @@ func (v routeRegexpGroup) setMatch(req *http.Request, m *RouteMatch, r *Route) {
// Store host variables.
if v.host != nil {
host := getHost(req)
+ if v.host.wildcardHostPort {
+ // Don't be strict on the port match
+ if i := strings.Index(host, ":"); i != -1 {
+ host = host[:i]
+ }
+ }
matches := v.host.regexp.FindStringSubmatchIndex(host)
if len(matches) > 0 {
extractVars(host, matches, v.host.varsN, m.Vars)