Support []byte return value from handler

hoisie · hoisie · commit 4166509a8408 · 2012-03-07T11:40:34.000-08:00
diff --git a/web.go b/web.go
@@ -353,25 +353,28 @@ func (s *Server) routeHandler(req *Request, c conn) {
 
         ret, err := s.safelyCall(route.handler, args)
         if err != nil {
-            //fmt.Printf("%v\n", err)
             //there was an error or panic while calling the handler
             ctx.Abort(500, "Server Error")
         }
-
+        if ctx.responseStarted {
+            return
+        }
         if len(ret) == 0 {
             return
         }
 
         sval := ret[0]
 
-        if sval.Kind() == reflect.String &&
-            !ctx.responseStarted {
-            content := []byte(sval.String())
-            ctx.SetHeader("Content-Length", strconv.Itoa(len(content)), true)
-            ctx.StartResponse(200)
-            ctx.Write(content)
-        }
+        var content []byte
 
+        if sval.Kind() == reflect.String {
+            content = []byte(sval.String())
+        } else if sval.Kind() == reflect.Slice && sval.Type().Elem().Kind() == reflect.Uint8 {
+            content = sval.Interface().([]byte)
+        }
+        ctx.SetHeader("Content-Length", strconv.Itoa(len(content)), true)
+        ctx.StartResponse(200)
+        ctx.Write(content)
         return
     }
 
diff --git a/web_test.go b/web_test.go
@@ -46,7 +46,6 @@ func buildTestResponse(buf *bytes.Buffer) *testResponse {
 
     response := testResponse{headers: make(map[string][]string), cookies: make(map[string]string)}
     s := buf.String()
-
     contents := strings.SplitN(s, "\r\n\r\n", 2)
 
     header := contents[0]
@@ -171,6 +170,12 @@ func init() {
         return string(data)
     })
 
+    Get("/jsonbytes", func(ctx *Context) []byte {
+        ctx.ContentType("json")
+        data, _ := json.Marshal(ctx.Params)
+        return data
+    })
+
     Post("/parsejson", func(ctx *Context) string {
         var tmp = struct{ A string; B string }{}
         json.NewDecoder(ctx.Request.Body).Decode(&tmp)
@@ -207,6 +212,7 @@ var tests = []Test{
     {"GET", "/fullparams?a=1&a=2&a=3", "", 200, "1,2,3"},
     {"GET", "/panic", "", 500, "Server Error"},
     {"GET", "/json?a=1&b=2", "", 200, `{"a":"1","b":"2"}`},
+    {"GET", "/jsonbytes?a=1&b=2", "", 200, `{"a":"1","b":"2"}`},
     //{"GET", "/methodhandler", "", 200, `a`},
     //{"GET", "/methodhandler2?b=b", "", 200, `ab`},
     //{"GET", "/methodhandler3/b", "", 200, `ab`},
