Updated deps, removed json-iterator, fixed #1087, fixed #1086

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

Author: vishr

Gopkg.lock

@@ -39,8 +39,4 @@
 
 [[constraint]]
   branch = "master"
-  name = "golang.org/x/crypto"
-
-[[constraint]]
-  name = "github.com/json-iterator/go"
-  version = "1.1.2"
+  name = "golang.org/x/crypto"

Gopkg.toml

@@ -2,6 +2,7 @@ package echo
 
 import (
 	"bytes"
+	"encoding/json"
 	"encoding/xml"
 	"fmt"
 	"io"
@@ -12,8 +13,6 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
-
-	"github.com/json-iterator/go"
 )
 
 type (
@@ -207,10 +206,6 @@ const (
 	indexPage     = "index.html"
 )
 
-var (
-	jsoni = jsoniter.ConfigCompatibleWithStandardLibrary
-)
-
 func (c *context) writeContentType(value string) {
 	header := c.Response().Header()
 	if header.Get(HeaderContentType) == "" {
@@ -414,15 +409,15 @@ func (c *context) JSON(code int, i interface{}) (err error) {
 	if c.echo.Debug || pretty {
 		return c.JSONPretty(code, i, "  ")
 	}
-	b, err := jsoni.Marshal(i)
+	b, err := json.Marshal(i)
 	if err != nil {
 		return
 	}
 	return c.JSONBlob(code, b)
 }
 
 func (c *context) JSONPretty(code int, i interface{}, indent string) (err error) {
-	b, err := jsoni.MarshalIndent(i, "", indent)
+	b, err := json.MarshalIndent(i, "", indent)
 	if err != nil {
 		return
 	}
@@ -434,7 +429,7 @@ func (c *context) JSONBlob(code int, b []byte) (err error) {
 }
 
 func (c *context) JSONP(code int, callback string, i interface{}) (err error) {
-	b, err := jsoni.Marshal(i)
+	b, err := json.Marshal(i)
 	if err != nil {
 		return
 	}

context.go

@@ -557,15 +557,15 @@ func (e *Echo) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	c := e.pool.Get().(*context)
 	c.Reset(r, w)
 
-	method := r.Method
+	m := r.Method
 	h := NotFoundHandler
 
 	if e.premiddleware == nil {
 		path := r.URL.RawPath
 		if path == "" {
 			path = r.URL.Path
 		}
-		e.router.Find(method, path, c)
+		e.router.Find(m, getPath(r), c)
 		h = c.Handler()
 		for i := len(e.middleware) - 1; i >= 0; i-- {
 			h = e.middleware[i](h)
@@ -576,7 +576,7 @@ func (e *Echo) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			if path == "" {
 				path = r.URL.Path
 			}
-			e.router.Find(method, path, c)
+			e.router.Find(m, getPath(r), c)
 			h := c.Handler()
 			for i := len(e.middleware) - 1; i >= 0; i-- {
 				h = e.middleware[i](h)
@@ -713,6 +713,14 @@ func WrapMiddleware(m func(http.Handler) http.Handler) MiddlewareFunc {
 	}
 }
 
+func getPath(r *http.Request) string {
+	path := r.URL.RawPath
+	if path == "" {
+		path = r.URL.Path
+	}
+	return path
+}
+
 func handlerName(h HandlerFunc) string {
 	t := reflect.ValueOf(h).Type()
 	if t.Kind() == reflect.Func {

echo.go

@@ -34,7 +34,7 @@ func TestRewrite(t *testing.T) {
 	assert.Equal(t, "/user/jack/order/1", req.URL.Path)
 }
 
-//Issue #1086
+// Issue #1086
 func TestEchoRewritePreMiddleware(t *testing.T) {
 	e := echo.New()
 	r := e.Router()