From 3db9633ebdaebf0946a7a98bf909b77018e99d06 Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 11 Jun 2014 11:12:17 +0800 Subject: [PATCH] remove websocket logic because not support handler --- router.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/router.go b/router.go index bc35e6a5..e7cc79e0 100644 --- a/router.go +++ b/router.go @@ -524,7 +524,10 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) var routerInfo *controllerInfo w := &responseWriter{writer: rw} - w.Header().Set("Server", BeegoServerName) + + if RunMode == "dev" { + w.Header().Set("Server", BeegoServerName) + } // init context context := &beecontext.Context{ @@ -536,10 +539,6 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) context.Output.Context = context context.Output.EnableGzip = EnableGzip - if context.Input.IsWebsocket() { - context.ResponseWriter = rw - } - // defined filter function do_filter := func(pos int) (started bool) { if p.enableFilter { @@ -702,7 +701,7 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) } //render template - if !w.started && !context.Input.IsWebsocket() { + if !w.started { if AutoRender { if err := execController.Render(); err != nil { panic(err)