3db9633e by astaxie

remove websocket logic because not support handler

1 parent 2f8a70d5
...@@ -524,7 +524,10 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) ...@@ -524,7 +524,10 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
524 var routerInfo *controllerInfo 524 var routerInfo *controllerInfo
525 525
526 w := &responseWriter{writer: rw} 526 w := &responseWriter{writer: rw}
527
528 if RunMode == "dev" {
527 w.Header().Set("Server", BeegoServerName) 529 w.Header().Set("Server", BeegoServerName)
530 }
528 531
529 // init context 532 // init context
530 context := &beecontext.Context{ 533 context := &beecontext.Context{
...@@ -536,10 +539,6 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) ...@@ -536,10 +539,6 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
536 context.Output.Context = context 539 context.Output.Context = context
537 context.Output.EnableGzip = EnableGzip 540 context.Output.EnableGzip = EnableGzip
538 541
539 if context.Input.IsWebsocket() {
540 context.ResponseWriter = rw
541 }
542
543 // defined filter function 542 // defined filter function
544 do_filter := func(pos int) (started bool) { 543 do_filter := func(pos int) (started bool) {
545 if p.enableFilter { 544 if p.enableFilter {
...@@ -702,7 +701,7 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) ...@@ -702,7 +701,7 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
702 } 701 }
703 702
704 //render template 703 //render template
705 if !w.started && !context.Input.IsWebsocket() { 704 if !w.started {
706 if AutoRender { 705 if AutoRender {
707 if err := execController.Render(); err != nil { 706 if err := execController.Render(); err != nil {
708 panic(err) 707 panic(err)
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!