go-packages/iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2025-02-09 02:34:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix https://github.com/kataras/iris/issues/455 occurs from last changes

Browse Source
This commit is contained in:
Gerasimos Maropoulos 2016-10-02 07:28:36 +03:00
parent 3970804a37
commit fe4b8bd7d2
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
iris.go
View File

@ -241,9 +241,7 @@ func New(setters ...OptionSetter) *Framework {
{ {
// set the servemux, which will provide us the public API also, with its context pool // set the servemux, which will provide us the public API also, with its context pool
mux := newServeMux(s.Logger) mux := newServeMux(s.Logger)
mux.correctPath = !s.Config.DisablePathCorrection mux.setCorrectPath(!s.Config.DisablePathCorrection) // correctPath is re-setted on .Set and after build*
// escapePath & correctPath are re-setted on .Set and after build*
mux.escapePath = !s.Config.DisablePathEscape
mux.onLookup = s.Plugins.DoPreLookup mux.onLookup = s.Plugins.DoPreLookup
s.contextPool.New = func() interface{} { s.contextPool.New = func() interface{} {
@ -273,9 +271,8 @@ func (s *Framework) Set(setters ...OptionSetter) {
setter.Set(s.Config) setter.Set(s.Config)
} }
if s.muxAPI != nil && s.mux != nil { // if called after .New if s.muxAPI != nil && s.mux != nil { // if called after .New, which it does, correctPath is the only field we need to be updated before .Listen, so:
s.mux.correctPath = !s.Config.DisablePathCorrection s.mux.setCorrectPath(!s.Config.DisablePathCorrection)
s.mux.escapePath = !s.Config.DisablePathEscape
} }
} }
@ -335,6 +332,10 @@ func (s *Framework) Build() {
s.Websocket.RegisterTo(s, s.Config.Websocket) s.Websocket.RegisterTo(s, s.Config.Websocket)
} }
// prepare the mux runtime fields again, for any case
s.mux.setCorrectPath(!s.Config.DisablePathCorrection)
s.mux.setEscapePath(!s.Config.DisablePathEscape)
// prepare the server's handler, we do that check because iris supports // prepare the server's handler, we do that check because iris supports
// custom routers (you can take the routes registed by iris using iris.Lookups function) // custom routers (you can take the routes registed by iris using iris.Lookups function)
if s.Router == nil { if s.Router == nil {
@ -368,9 +369,6 @@ func (s *Framework) Build() {
s.Config.VScheme = ParseScheme(s.Config.VHost) s.Config.VScheme = ParseScheme(s.Config.VHost)
} }
// prepare the mux runtime fields
s.mux.setCorrectPath(!s.Config.DisablePathCorrection)
s.mux.setEscapePath(!s.Config.DisablePathEscape)
// set the mux' hostname (for multi subdomain routing) // set the mux' hostname (for multi subdomain routing)
s.mux.hostname = ParseHostname(s.Config.VHost) s.mux.hostname = ParseHostname(s.Config.VHost)