Merge pull request hoisie#197 from hoisie/content-type-custom-handler

hoisie · web-flow · commit ffb574b09a28 · 2016-07-30T20:57:38.000-07:00
Content type custom handler
diff --git a/server.go b/server.go
@@ -123,8 +123,8 @@ func (s *Server) Match(method string, route string, handler interface{}) {
 	s.addRoute(route, method, handler)
 }
 
-//Adds a custom handler. Only for webserver mode. Will have no effect when running as FCGI or SCGI.
-func (s *Server) Handler(route string, method string, httpHandler http.Handler) {
+// Add a custom http.Handler. Will have no effect when running as FCGI or SCGI.
+func (s *Server) Handle(route string, method string, httpHandler http.Handler) {
 	s.addRoute(route, method, httpHandler)
 }
 
@@ -335,9 +335,6 @@ func (s *Server) routeHandler(req *http.Request, w http.ResponseWriter) (unused
 		}
 	}
 
-	//Set the default content-type
-	ctx.SetHeader("Content-Type", "text/html; charset=utf-8", true)
-
 	for i := 0; i < len(s.routes); i++ {
 		route := s.routes[i]
 		cr := route.cr
@@ -361,6 +358,9 @@ func (s *Server) routeHandler(req *http.Request, w http.ResponseWriter) (unused
 			return
 		}
 
+		// set the default content-type
+		ctx.SetHeader("Content-Type", "text/html; charset=utf-8", true)
+
 		var args []reflect.Value
 		handlerType := route.handler.Type()
 		if requiresContext(handlerType) {
diff --git a/web.go b/web.go
@@ -43,6 +43,7 @@ func (ctx *Context) WriteString(content string) {
 // Once it has been called, any return value from the handler will
 // not be written to the response.
 func (ctx *Context) Abort(status int, body string) {
+	ctx.SetHeader("Content-Type", "text/html; charset=utf-8", true)
 	ctx.ResponseWriter.WriteHeader(status)
 	ctx.ResponseWriter.Write([]byte(body))
 }
@@ -250,9 +251,9 @@ func Match(method string, route string, handler interface{}) {
 	mainServer.addRoute(route, method, handler)
 }
 
-//Adds a custom handler. Only for webserver mode. Will have no effect when running as FCGI or SCGI.
-func Handler(route string, method string, httpHandler http.Handler) {
-	mainServer.Handler(route, method, httpHandler)
+// Add a custom http.Handler. Will have no effect when running as FCGI or SCGI.
+func Handle(route string, method string, httpHandler http.Handler) {
+	mainServer.Handle(route, method, httpHandler)
 }
 
 //Adds a handler for websockets. Only for webserver mode. Will have no effect when running as FCGI or SCGI.
diff --git a/web_test.go b/web_test.go
@@ -591,6 +591,24 @@ func TestNoColorOutput(t *testing.T) {
 	}
 }
 
+type TestHandler struct{}
+
+func (t *TestHandler) ServeHTTP(c http.ResponseWriter, req *http.Request) {
+}
+
+// When a custom HTTP handler is used, the Content-Type header should not be set to a default.
+// Go's FileHandler does not replace the Content-Type header if it is already set.
+func TestCustomHandlerContentType(t *testing.T) {
+	s := NewServer()
+	s.Handle("/testHandler", "GET", &TestHandler{})
+	req := buildTestRequest("GET", "/testHandler", "", nil, nil)
+	c := scgiConn{wroteHeaders: false, req: req, headers: make(map[string][]string), fd: nil}
+	s.Process(&c, req)
+	if c.headers["Content-Type"] != nil {
+		t.Fatalf("A default Content-Type should not be present when using a custom HTTP handler")
+	}
+}
+
 func BuildBasicAuthCredentials(user string, pass string) string {
 	s := user + ":" + pass
 	return "Basic " + base64.StdEncoding.EncodeToString([]byte(s))

Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,8 @@ func (s *Server) Match(method string, route string, handler interface{}) {`
`123`	`123`	`s.addRoute(route, method, handler)`
`124`	`124`	`}`
`125`	`125`
`126`		`-//Adds a custom handler. Only for webserver mode. Will have no effect when running as FCGI or SCGI.`
`127`		`-func (s *Server) Handler(route string, method string, httpHandler http.Handler) {`
	`126`	`+// Add a custom http.Handler. Will have no effect when running as FCGI or SCGI.`
	`127`	`+func (s *Server) Handle(route string, method string, httpHandler http.Handler) {`
`128`	`128`	`s.addRoute(route, method, httpHandler)`
`129`	`129`	`}`
`130`	`130`
`@@ -335,9 +335,6 @@ func (s Server) routeHandler(req http.Request, w http.ResponseWriter) (unused`
`335`	`335`	`}`
`336`	`336`	`}`
`337`	`337`
`338`		`- //Set the default content-type`
`339`		`- ctx.SetHeader("Content-Type", "text/html; charset=utf-8", true)`
`340`		`-`
`341`	`338`	`for i := 0; i < len(s.routes); i++ {`
`342`	`339`	`route := s.routes[i]`
`343`	`340`	`cr := route.cr`
`@@ -361,6 +358,9 @@ func (s Server) routeHandler(req http.Request, w http.ResponseWriter) (unused`
`361`	`358`	`return`
`362`	`359`	`}`
`363`	`360`
	`361`	`+ // set the default content-type`
	`362`	`+ ctx.SetHeader("Content-Type", "text/html; charset=utf-8", true)`
	`363`	`+`
`364`	`364`	`var args []reflect.Value`
`365`	`365`	`handlerType := route.handler.Type()`
`366`	`366`	`if requiresContext(handlerType) {`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ func (ctx *Context) WriteString(content string) {`
`43`	`43`	`// Once it has been called, any return value from the handler will`
`44`	`44`	`// not be written to the response.`
`45`	`45`	`func (ctx *Context) Abort(status int, body string) {`
	`46`	`+ ctx.SetHeader("Content-Type", "text/html; charset=utf-8", true)`
`46`	`47`	`ctx.ResponseWriter.WriteHeader(status)`
`47`	`48`	`ctx.ResponseWriter.Write([]byte(body))`
`48`	`49`	`}`
`@@ -250,9 +251,9 @@ func Match(method string, route string, handler interface{}) {`
`250`	`251`	`mainServer.addRoute(route, method, handler)`
`251`	`252`	`}`
`252`	`253`
`253`		`-//Adds a custom handler. Only for webserver mode. Will have no effect when running as FCGI or SCGI.`
`254`		`-func Handler(route string, method string, httpHandler http.Handler) {`
`255`		`- mainServer.Handler(route, method, httpHandler)`
	`254`	`+// Add a custom http.Handler. Will have no effect when running as FCGI or SCGI.`
	`255`	`+func Handle(route string, method string, httpHandler http.Handler) {`
	`256`	`+ mainServer.Handle(route, method, httpHandler)`
`256`	`257`	`}`
`257`	`258`
`258`	`259`	`//Adds a handler for websockets. Only for webserver mode. Will have no effect when running as FCGI or SCGI.`