go/echo
go/echo
1
0
Fork 0
mirror of https://github.com/labstack/echo.git synced 2025-05-13 22:06:36 +02:00
Code Issues Releases Activity

Fixed #51

Browse Source 
Signed-off-by: Vishal Rana <vr@labstack.com>
This commit is contained in:
Vishal Rana 2015-05-08 11:21:50 -07:00
parent 08e23c1e55
commit 04cdefb2a6
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
context.go
View File

@ -10,7 +10,7 @@ type (
// response references, path parameters, data and registered handler. // response references, path parameters, data and registered handler.
Context struct { Context struct {
Request *http.Request Request *http.Request
Response *response Response *Response
pnames []string pnames []string
pvalues []string pvalues []string
store store store store

2
context_test.go
View File

@ -27,7 +27,7 @@ func TestContext(t *testing.T) {
b, _ := json.Marshal(u1) b, _ := json.Marshal(u1)
r, _ := http.NewRequest(POST, "/users/1", bytes.NewReader(b)) r, _ := http.NewRequest(POST, "/users/1", bytes.NewReader(b))
c := &Context{ c := &Context{
Response: &response{Writer: httptest.NewRecorder()}, Response: &Response{Writer: httptest.NewRecorder()},
Request: r, Request: r,
pvalues: make([]string, 5), pvalues: make([]string, 5),
store: make(store), store: make(store),

2
echo.go
View File

@ -114,7 +114,7 @@ func New() (e *Echo) {
e.Router = NewRouter(e) e.Router = NewRouter(e)
e.pool.New = func() interface{} { e.pool.New = func() interface{} {
return &Context{ return &Context{
Response: &response{}, Response: &Response{},
pnames: make([]string, e.maxParam), pnames: make([]string, e.maxParam),
pvalues: make([]string, e.maxParam), pvalues: make([]string, e.maxParam),
store: make(store), store: make(store),

14
response.go
View File

@ -8,7 +8,7 @@ import (
) )
type ( type (
response struct { Response struct {
Writer http.ResponseWriter Writer http.ResponseWriter
status int status int
size int size int
@ -16,11 +16,11 @@ type (
} }
) )
func (r *response) Header() http.Header { func (r *Response) Header() http.Header {
return r.Writer.Header() return r.Writer.Header()
} }
func (r *response) WriteHeader(n int) { func (r *Response) WriteHeader(n int) {
if r.committed { if r.committed {
// TODO: Warning // TODO: Warning
log.Printf("echo: %s", color.Yellow("response already committed")) log.Printf("echo: %s", color.Yellow("response already committed"))
@ -31,21 +31,21 @@ func (r *response) WriteHeader(n int) {
r.committed = true r.committed = true
} }
func (r *response) Write(b []byte) (n int, err error) { func (r *Response) Write(b []byte) (n int, err error) {
n, err = r.Writer.Write(b) n, err = r.Writer.Write(b)
r.size += n r.size += n
return n, err return n, err
} }
func (r *response) Status() int { func (r *Response) Status() int {
return r.status return r.status
} }
func (r *response) Size() int { func (r *Response) Size() int {
return r.size return r.size
} }
func (r *response) reset(w http.ResponseWriter) { func (r *Response) reset(w http.ResponseWriter) {
r.Writer = w r.Writer = w
r.committed = false r.committed = false
} }

2
response_test.go
View File

@ -7,7 +7,7 @@ import (
) )
func TestResponse(t *testing.T) { func TestResponse(t *testing.T) {
r := &response{Writer: httptest.NewRecorder()} r := &Response{Writer: httptest.NewRecorder()}
// Header // Header
if r.Header() == nil { if r.Header() == nil {