go-packages/iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2025-03-11 01:06:20 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

upstream fixes

Browse Source 
Former-commit-id: 574060e41ace86cd86588795eadb1ad4083ec630
This commit is contained in:
Gerasimos (Makis) Maropoulos 2018-09-13 02:53:13 +03:00
parent efa17e8899
commit 52a07df0f4
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gopkg.lock generated
View File

@ -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"

2
Gopkg.toml
View File

@ -71,8 +71,8 @@
name = "golang.org/x/crypto"
[[constraint]]
branch = "v2"
name = "gopkg.in/yaml.v2"
version = "2.2.1"
[[constraint]]
branch = "master"

3
README.md
View File

@ -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")

4
configuration.go
View File

@ -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()

2
context/context.go
View File

@ -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"`
}