From 52a07df0f4a9534b9f085f4bcc39d988050778a2 Mon Sep 17 00:00:00 2001
From: "Gerasimos (Makis) Maropoulos" <kataras2006@hotmail.com>
Date: Thu, 13 Sep 2018 02:53:13 +0300
Subject: [PATCH] upstream fixes

Former-commit-id: 574060e41ace86cd86588795eadb1ad4083ec630
---
 Gopkg.lock         | 4 ++--
 Gopkg.toml         | 2 +-
 README.md          | 3 ++-
 configuration.go   | 4 ++--
 context/context.go | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index d392261b..1f3d8186 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -260,10 +260,10 @@
   version = "v1.28.2"
 
 [[projects]]
-  branch = "v2"
   name = "gopkg.in/yaml.v2"
   packages = ["."]
-  revision = "eb3733d160e74a9c7e442f435eb3bea458e1d19f"
+  revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
+  version = "2.2.1"
 
 [[projects]]
   branch = "master"
diff --git a/Gopkg.toml b/Gopkg.toml
index b0efe846..8274cd48 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -71,8 +71,8 @@
   name = "golang.org/x/crypto"
 
 [[constraint]]
-  branch = "v2"
   name = "gopkg.in/yaml.v2"
+  version = "2.2.1"
 
 [[constraint]]
   branch = "master"
diff --git a/README.md b/README.md
index b8b32f5e..3ae3103a 100644
--- a/README.md
+++ b/README.md
@@ -230,7 +230,8 @@ func main() {
         ctx.Writef("User with ID: %d", id)
     })
 
-    // However, this one will match /user/john/ and also /user/john/send.
+    // However, this one will match /user/john/send and also /user/john/everything/else/here
+    // but will not match /user/john neither /user/john/.
     app.Post("/user/{name:string}/{action:path}", func(ctx iris.Context) {
         name := ctx.Params().Get("name")
         action := ctx.Params().Get("action")
diff --git a/configuration.go b/configuration.go
index 3dedfce4..6ee8071f 100644
--- a/configuration.go
+++ b/configuration.go
@@ -118,8 +118,8 @@ func YAML(filename string) Configuration {
 // see `WithGlobalConfiguration` for more information.
 //
 // Usage:
-// app.Configure(iris.WithConfiguration(iris.YAML("myconfig.tml"))) or
-// app.Run([iris.Runner], iris.WithConfiguration(iris.YAML("myconfig.tml"))).
+// app.Configure(iris.WithConfiguration(iris.TOML("myconfig.tml"))) or
+// app.Run([iris.Runner], iris.WithConfiguration(iris.TOML("myconfig.tml"))).
 func TOML(filename string) Configuration {
 	c := DefaultConfiguration()
 
diff --git a/context/context.go b/context/context.go
index b558fe9a..1ca344d0 100644
--- a/context/context.go
+++ b/context/context.go
@@ -1724,7 +1724,7 @@ type (
 		Subdomain  string                   `json:"subdomain" form:"referrer_subdomain" xml:"Subdomain" yaml:"Subdomain" toml:"Subdomain"`
 		Domain     string                   `json:"domain" form:"referrer_domain" xml:"Domain" yaml:"Domain" toml:"Domain"`
 		Tld        string                   `json:"tld" form:"referrer_tld" xml:"Tld" yaml:"Tld" toml:"Tld"`
-		Path       string                   `jsonn:"path" form:"referrer_path" xml:"Path" yaml:"Path" toml:"Path"`
+		Path       string                   `json:"path" form:"referrer_path" xml:"Path" yaml:"Path" toml:"Path"`
 		Query      string                   `json:"query" form:"referrer_query" xml:"Query" yaml:"Query" toml:"GoogleType"`
 		GoogleType ReferrerGoogleSearchType `json:"googleType" form:"referrer_google_type" xml:"GoogleType" yaml:"GoogleType" toml:"GoogleType"`
 	}