From 797bd9826913de864e11d3615a5b6617cd7a7900 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 22 Sep 2013 14:32:18 +0800 Subject: [PATCH] fix #210 --- router.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/router.go b/router.go index f90d2be8..be063a9a 100644 --- a/router.go +++ b/router.go @@ -444,18 +444,15 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) vc := reflect.New(runrouter.controllerType) //call the controller init function - init := vc.MethodByName("Init") + method := vc.MethodByName("Init") in := make([]reflect.Value, 2) in[0] = reflect.ValueOf(context) in[1] = reflect.ValueOf(runrouter.controllerType.Name()) - init.Call(in) - //call prepare function - in = make([]reflect.Value, 0) - method := vc.MethodByName("Prepare") method.Call(in) //if XSRF is Enable then check cookie where there has any cookie in the request's cookie _csrf if EnableXSRF { + in = make([]reflect.Value, 0) method = vc.MethodByName("XsrfToken") method.Call(in) if r.Method == "POST" || r.Method == "DELETE" || r.Method == "PUT" || @@ -465,6 +462,11 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) } } + //call prepare function + in = make([]reflect.Value, 0) + method = vc.MethodByName("Prepare") + method.Call(in) + //if response has written,yes don't run next if !w.started { if r.Method == "GET" {