Now using sync.Pool

Signed-off-by: Vishal Rana <[email protected]>

Author: vishr

context.go

@@ -47,7 +47,7 @@ type (
 		Redirect(int, string) error
 		Error(err error)
 		Logger() *log.Logger
-		X() *context
+		Context() *context
 	}
 
 	context struct {
@@ -307,8 +307,8 @@ func (c *context) Logger() *log.Logger {
 	return c.echo.logger
 }
 
-// X returns the `context` instance.
-func (c *context) X() *context {
+// Context returns the `context` instance.
+func (c *context) Context() *context {
 	return c
 }
 

context_test.go

@@ -51,8 +51,8 @@ func TestContext(t *testing.T) {
 	assert.Nil(t, c.Socket())
 
 	// Param by id
-	c.X().pnames = []string{"id"}
-	c.X().pvalues = []string{"1"}
+	c.Context().pnames = []string{"id"}
+	c.Context().pvalues = []string{"1"}
 	assert.Equal(t, "1", c.P(0))
 
 	// Param by name
@@ -68,13 +68,13 @@ func TestContext(t *testing.T) {
 
 	// JSON
 	testBindOk(t, c, ApplicationJSON)
-	c.X().request = test.NewRequest(POST, "/", strings.NewReader(incorrectContent))
+	c.Context().request = test.NewRequest(POST, "/", strings.NewReader(incorrectContent))
 	testBindError(t, c, ApplicationJSON)
 
 	// XML
-	c.X().request = test.NewRequest(POST, "/", strings.NewReader(userXML))
+	c.Context().request = test.NewRequest(POST, "/", strings.NewReader(userXML))
 	testBindOk(t, c, ApplicationXML)
-	c.X().request = test.NewRequest(POST, "/", strings.NewReader(incorrectContent))
+	c.Context().request = test.NewRequest(POST, "/", strings.NewReader(incorrectContent))
 	testBindError(t, c, ApplicationXML)
 
 	// Unsupported
@@ -87,14 +87,14 @@ func TestContext(t *testing.T) {
 	tpl := &Template{
 		templates: template.Must(template.New("hello").Parse("Hello, {{.}}!")),
 	}
-	c.X().echo.SetRenderer(tpl)
+	c.Context().echo.SetRenderer(tpl)
 	err := c.Render(http.StatusOK, "hello", "Joe")
 	if assert.NoError(t, err) {
 		assert.Equal(t, http.StatusOK, rec.Status())
 		assert.Equal(t, "Hello, Joe!", rec.Body.String())
 	}
 
-	c.X().echo.renderer = nil
+	c.Context().echo.renderer = nil
 	err = c.Render(http.StatusOK, "hello", "Joe")
 	assert.Error(t, err)
 
@@ -226,12 +226,12 @@ func TestContext(t *testing.T) {
 
 	// Error
 	rec = test.NewResponseRecorder()
-	c = NewContext(req, rec, e).X()
+	c = NewContext(req, rec, e).Context()
 	c.Error(errors.New("error"))
 	assert.Equal(t, http.StatusInternalServerError, c.Response().Status())
 
 	// reset
-	c.X().reset(req, test.NewResponseRecorder(), e)
+	c.Context().reset(req, test.NewResponseRecorder(), e)
 }
 
 func TestContextPath(t *testing.T) {

echo.go

@@ -554,8 +554,23 @@ func (e *Echo) SetEngine(t engine.Type) {
 }
 
 // Run runs a server.
-func (e *Echo) Run(address string) {
-	config := &engine.Config{Address: address}
+func (e *Echo) Run(addr string) {
+	c := &engine.Config{Address: addr}
+	e.RunWithConfig(c)
+}
+
+// RunTLS runs a server with TLS configuration.
+func (e *Echo) RunTLS(addr, certfile, keyfile string) {
+	c := &engine.Config{
+		Address:     addr,
+		TLSCertfile: certfile,
+		TLSKeyfile:  keyfile,
+	}
+	e.RunWithConfig(c)
+}
+
+// RunWithConfig runs a server with engine configuration.
+func (e *Echo) RunWithConfig(config *engine.Config) {
 	handler := func(req engine.Request, res engine.Response) {
 		if e.hook != nil {
 			e.hook(req, res)
@@ -585,38 +600,6 @@ func (e *Echo) Run(address string) {
 	}
 
 	e.engine.Start()
-
-	// e.run(e.Server(addr))
-}
-
-// RunTLS runs a server with TLS configuration.
-func (e *Echo) RunTLS(addr, crtFile, keyFile string) {
-	// e.run(e.Server(addr), crtFile, keyFile)
-}
-
-// RunServer runs a custom server.
-func (e *Echo) RunServer(s *http.Server) {
-	// e.run(s)
-}
-
-// RunTLSServer runs a custom server with TLS configuration.
-func (e *Echo) RunTLSServer(s *http.Server, crtFile, keyFile string) {
-	// e.run(s, crtFile, keyFile)
-}
-
-func (e *Echo) run(s *http.Server, files ...string) {
-	// s.Handler = e
-	// // TODO: Remove in Go 1.6+
-	// if e.http2 {
-	// 	http2.ConfigureServer(s, nil)
-	// }
-	// if len(files) == 0 {
-	// 	e.logger.Fatal(s.ListenAndServe())
-	// } else if len(files) == 2 {
-	// 	e.logger.Fatal(s.ListenAndServeTLS(files[0], files[1]))
-	// } else {
-	// 	e.logger.Fatal("invalid TLS configuration")
-	// }
 }
 
 func NewHTTPError(code int, msg ...string) *HTTPError {

echo_test.go

@@ -307,9 +307,9 @@ func TestEchoGroup(t *testing.T) {
 func TestEchoNotFound(t *testing.T) {
 	e := New()
 	req := test.NewRequest(GET, "/files", nil)
-	res := test.NewResponseRecorder()
-	e.ServeHTTP(req, res)
-	assert.Equal(t, http.StatusNotFound, res.Status())
+	rec := test.NewResponseRecorder()
+	e.ServeHTTP(req, rec)
+	assert.Equal(t, http.StatusNotFound, rec.Status())
 }
 
 func TestEchoMethodNotAllowed(t *testing.T) {
@@ -318,9 +318,9 @@ func TestEchoMethodNotAllowed(t *testing.T) {
 		return c.String(http.StatusOK, "Echo!")
 	})
 	req := test.NewRequest(POST, "/", nil)
-	res := test.NewResponseRecorder()
-	e.ServeHTTP(req, res)
-	assert.Equal(t, http.StatusMethodNotAllowed, res.Status())
+	rec := test.NewResponseRecorder()
+	e.ServeHTTP(req, rec)
+	assert.Equal(t, http.StatusMethodNotAllowed, rec.Status())
 }
 
 func TestEchoHTTPError(t *testing.T) {
@@ -349,8 +349,8 @@ func TestEchoHook(t *testing.T) {
 		}
 	})
 	req := test.NewRequest(GET, "/test/", nil)
-	res := test.NewResponseRecorder()
-	e.ServeHTTP(req, res)
+	rec := test.NewResponseRecorder()
+	e.ServeHTTP(req, rec)
 	assert.Equal(t, req.URL().Path(), "/test")
 }
 
@@ -370,7 +370,7 @@ func testMethod(t *testing.T, method, path string, e *Echo) {
 
 func request(method, path string, e *Echo) (int, string) {
 	req := test.NewRequest(method, path, nil)
-	res := test.NewResponseRecorder()
-	e.ServeHTTP(req, res)
-	return res.Status(), res.Body.String()
+	rec := test.NewResponseRecorder()
+	e.ServeHTTP(req, rec)
+	return rec.Status(), rec.Body.String()
 }

engine/engine.go

@@ -1,6 +1,9 @@
 package engine
 
-import "io"
+import (
+	"io"
+	"time"
+)
 
 type (
 	Type uint8
@@ -31,6 +34,8 @@ type (
 		Status() int
 		Size() int64
 		Committed() bool
+		SetWriter(io.Writer)
+		Writer() io.Writer
 	}
 
 	Header interface {
@@ -49,7 +54,11 @@ type (
 	}
 
 	Config struct {
-		Address string
+		Address      string
+		ReadTimeout  time.Duration
+		WriteTimeout time.Duration
+		TLSCertfile  string
+		TLSKeyfile   string
 	}
 )
 

engine/fasthttp/response.go

@@ -1,6 +1,8 @@
 package fasthttp
 
 import (
+	"io"
+
 	"github.com/labstack/echo/engine"
 	"github.com/valyala/fasthttp"
 )
@@ -12,6 +14,7 @@ type (
 		status    int
 		size      int64
 		committed bool
+		writer    io.Writer
 	}
 )
 
@@ -38,3 +41,11 @@ func (r *Response) Size() int64 {
 func (r *Response) Committed() bool {
 	return r.committed
 }
+
+func (r *Response) SetWriter(w io.Writer) {
+	r.writer = w
+}
+
+func (r *Response) Writer() io.Writer {
+	return r.writer
+}

engine/fasthttp/server.go

@@ -1,8 +1,9 @@
 package fasthttp
 
 import (
-	"log"
 	"net/http"
+
+	"github.com/labstack/gommon/log"
 )
 import (
 	"github.com/labstack/echo/engine"
@@ -27,7 +28,6 @@ func NewServer(config *engine.Config, handler engine.HandlerFunc) *Server {
 
 func (s *Server) Start() {
 	fasthttp.ListenAndServe(s.config.Address, func(ctx *fasthttp.RequestCtx) {
-		println("FastHTTP")
 		req := &Request{
 			context: ctx,
 			url:     &URL{ctx.URI()},

engine/standard/header.go

@@ -4,22 +4,26 @@ import "net/http"
 
 type (
 	Header struct {
-		http.Header
+		header http.Header
 	}
 )
 
 func (h *Header) Add(key, val string) {
-	h.Header.Add(key, val)
+	h.header.Add(key, val)
 }
 
 func (h *Header) Del(key string) {
-	h.Header.Del(key)
+	h.header.Del(key)
 }
 
 func (h *Header) Get(key string) string {
-	return h.Header.Get(key)
+	return h.header.Get(key)
 }
 
 func (h *Header) Set(key, val string) {
-	h.Header.Set(key, val)
+	h.header.Set(key, val)
+}
+
+func (h *Header) reset(hdr http.Header) {
+	h.header = hdr
 }

engine/standard/request.go

@@ -18,7 +18,7 @@ type (
 func NewRequest(r *http.Request) *Request {
 	return &Request{
 		request: r,
-		url:     NewURL(r.URL),
+		url:     &URL{url: r.URL},
 		header:  &Header{r.Header},
 	}
 }
@@ -54,3 +54,9 @@ func (r *Request) Body() io.ReadCloser {
 func (r *Request) FormValue(name string) string {
 	return r.request.FormValue(name)
 }
+
+func (r *Request) reset(req *http.Request, h engine.Header, u engine.URL) {
+	r.request = req
+	r.header = h
+	r.url = u
+}

engine/standard/response.go

@@ -1,7 +1,11 @@
 package standard
 
-import "net/http"
-import "github.com/labstack/echo/engine"
+import (
+	"io"
+	"net/http"
+
+	"github.com/labstack/echo/engine"
+)
 
 type (
 	Response struct {
@@ -10,13 +14,15 @@ type (
 		status    int
 		size      int64
 		committed bool
+		writer    io.Writer
 	}
 )
 
 func NewResponse(w http.ResponseWriter) *Response {
 	return &Response{
 		response: w,
 		header:   &Header{w.Header()},
+		writer:   w,
 	}
 }
 
@@ -35,7 +41,7 @@ func (r *Response) WriteHeader(code int) {
 }
 
 func (r *Response) Write(b []byte) (n int, err error) {
-	n, err = r.response.Write(b)
+	n, err = r.writer.Write(b)
 	r.size += int64(n)
 	return
 }
@@ -51,3 +57,20 @@ func (r *Response) Size() int64 {
 func (r *Response) Committed() bool {
 	return r.committed
 }
+
+func (r *Response) SetWriter(w io.Writer) {
+	r.writer = w
+}
+
+func (r *Response) Writer() io.Writer {
+	return r.writer
+}
+
+func (r *Response) reset(w http.ResponseWriter, h engine.Header) {
+	r.response = w
+	r.header = h
+	r.status = http.StatusOK
+	r.size = 0
+	r.committed = false
+	r.writer = w
+}