diff --git a/LICENSE b/LICENSE index a56c9e1a..2799efef 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2017-2019 The Iris Authors. All rights reserved. +Copyright (c) 2017-2020 The Iris Authors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are diff --git a/NOTICE b/NOTICE index b86f00a5..614039b9 100644 --- a/NOTICE +++ b/NOTICE @@ -69,10 +69,9 @@ Revision ID: 607b5b7cef034da2692f99a4c9bafb31a999ccda toml 3012a1dbe2e4bd1 https://github.com/BurntSushi/toml 391d42b32f0577c b7bbc7f005 - yaml.v2 51d6538a90f86fe https://gopkg.in/yaml.v2 - 93ac480b35f37b2 - be17fef232 - + yaml.v3 4206685974f28e3 https://gopkg.in/yaml.v3 + 178b35fa198a598 + 99aa4dee3a ================================================================================ diff --git a/_examples/http_request/read-custom-per-type/main.go b/_examples/http_request/read-custom-per-type/main.go index 0e29f647..f445cc7d 100644 --- a/_examples/http_request/read-custom-per-type/main.go +++ b/_examples/http_request/read-custom-per-type/main.go @@ -1,7 +1,7 @@ package main import ( - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" "github.com/kataras/iris/v12" ) diff --git a/_examples/http_request/read-custom-via-unmarshaler/main.go b/_examples/http_request/read-custom-via-unmarshaler/main.go index 41e12372..e83edade 100644 --- a/_examples/http_request/read-custom-via-unmarshaler/main.go +++ b/_examples/http_request/read-custom-via-unmarshaler/main.go @@ -1,7 +1,7 @@ package main import ( - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" "github.com/kataras/iris/v12" ) diff --git a/cache/AUTHORS b/cache/AUTHORS deleted file mode 100644 index 67727e1c..00000000 --- a/cache/AUTHORS +++ /dev/null @@ -1,4 +0,0 @@ -# This is the official list of Iris Cache authors for copyright -# purposes. - -Gerasimos Maropoulos diff --git a/cache/LICENSE b/cache/LICENSE deleted file mode 100644 index 568450b0..00000000 --- a/cache/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2017-2019 The Iris Cache Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Iris nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/configuration.go b/configuration.go index fffbbe74..aa43f73a 100644 --- a/configuration.go +++ b/configuration.go @@ -19,7 +19,7 @@ import ( "github.com/BurntSushi/toml" "github.com/kataras/sitemap" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) const globalConfigurationKeyword = "~" diff --git a/configuration_test.go b/configuration_test.go index df9a052a..5a1b1e6b 100644 --- a/configuration_test.go +++ b/configuration_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) // $ go test -v -run TestConfiguration* diff --git a/context/context.go b/context/context.go index 15c9a832..2154f290 100644 --- a/context/context.go +++ b/context/context.go @@ -30,7 +30,7 @@ import ( "github.com/iris-contrib/schema" jsoniter "github.com/json-iterator/go" "github.com/microcosm-cc/bluemonday" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) type ( diff --git a/core/netutil/addr.go b/core/netutil/addr.go index 18ffcb09..c945229e 100644 --- a/core/netutil/addr.go +++ b/core/netutil/addr.go @@ -215,9 +215,5 @@ func ResolveSchemeFromVHost(vhost string) string { // and returns its URL, pure implementation but it does the job. func ResolveURL(scheme string, addr string) string { host := ResolveVHost(addr) - if host == "0.0.0.0" { - host = "localhost" - } - return scheme + "://" + host } diff --git a/doc.go b/doc.go index 14211da0..8d05cdd3 100644 --- a/doc.go +++ b/doc.go @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2019 The Iris Authors. All rights reserved. +// Copyright (c) 2017-2020 The Iris Authors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/go.mod b/go.mod index cdfa4775..ba8d2054 100644 --- a/go.mod +++ b/go.mod @@ -19,18 +19,18 @@ require ( github.com/iris-contrib/go.uuid v2.0.0+incompatible github.com/iris-contrib/pongo2 v0.0.1 github.com/iris-contrib/schema v0.0.1 - github.com/json-iterator/go v1.1.6 + github.com/json-iterator/go v1.1.9 github.com/kataras/golog v0.0.10 github.com/kataras/neffos v0.0.12 github.com/kataras/sitemap v0.0.5 - github.com/klauspost/compress v1.9.0 - github.com/mediocregopher/radix/v3 v3.3.0 + github.com/klauspost/compress v1.9.7 + github.com/mediocregopher/radix/v3 v3.4.2 github.com/microcosm-cc/bluemonday v1.0.2 github.com/ryanuber/columnize v2.1.0+incompatible github.com/schollz/closestmatch v2.1.0+incompatible - golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 + golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 - golang.org/x/text v0.3.0 - gopkg.in/ini.v1 v1.51.0 - gopkg.in/yaml.v2 v2.2.2 + golang.org/x/text v0.3.2 + gopkg.in/ini.v1 v1.51.1 + gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2 ) diff --git a/hero/AUTHORS b/hero/AUTHORS deleted file mode 100644 index 848245bb..00000000 --- a/hero/AUTHORS +++ /dev/null @@ -1 +0,0 @@ -Gerasimos Maropoulos diff --git a/hero/LICENSE b/hero/LICENSE deleted file mode 100644 index 970e41a7..00000000 --- a/hero/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2018-2019 Gerasimos Maropoulos. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Iris nor the name of Iris Hero, nor the names of its -contributor, Gerasimos Maropoulos, may be used to endorse or promote products -derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/i18n/loader.go b/i18n/loader.go index fceed8b9..5ef36934 100644 --- a/i18n/loader.go +++ b/i18n/loader.go @@ -14,7 +14,7 @@ import ( "github.com/BurntSushi/toml" "golang.org/x/text/language" "gopkg.in/ini.v1" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) // LoaderConfig is an optional configuration structure which contains diff --git a/macro/AUTHORS b/macro/AUTHORS deleted file mode 100644 index 04764750..00000000 --- a/macro/AUTHORS +++ /dev/null @@ -1,4 +0,0 @@ -# This is the official list of Iris Macro and Route path interpreter authors for copyright -# purposes. - -Gerasimos Maropoulos diff --git a/macro/LICENSE b/macro/LICENSE deleted file mode 100644 index 8f0865b2..00000000 --- a/macro/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2017-2019 The Iris Macro and Route path interpreter. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Iris nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/mvc/AUTHORS b/mvc/AUTHORS deleted file mode 100644 index 848245bb..00000000 --- a/mvc/AUTHORS +++ /dev/null @@ -1 +0,0 @@ -Gerasimos Maropoulos diff --git a/mvc/LICENSE b/mvc/LICENSE deleted file mode 100644 index fb9b3b8a..00000000 --- a/mvc/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2018-2019 Gerasimos Maropoulos. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Iris nor the names of its -contributor, Gerasimos Maropoulos, may be used to endorse or promote products -derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/sessions/AUTHORS b/sessions/AUTHORS deleted file mode 100644 index 689d61a9..00000000 --- a/sessions/AUTHORS +++ /dev/null @@ -1,4 +0,0 @@ -# This is the official list of Iris Sessions authors for copyright -# purposes. - -Gerasimos Maropoulos diff --git a/sessions/LICENSE b/sessions/LICENSE deleted file mode 100644 index ca7456f2..00000000 --- a/sessions/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2017-2019 The Iris Sessions Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Iris nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/typescript/AUTHORS b/typescript/AUTHORS deleted file mode 100644 index b616c321..00000000 --- a/typescript/AUTHORS +++ /dev/null @@ -1,4 +0,0 @@ -# This is the official list of Iris Typescript authors for copyright -# purposes. - -Gerasimos Maropoulos diff --git a/typescript/LICENSE b/typescript/LICENSE deleted file mode 100644 index 50c59d41..00000000 --- a/typescript/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2017-2019 The Iris Typescript Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Iris nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file