fix issue #1086

Author: Jeffrey Reuling (TI)

echo.go

@@ -558,20 +558,24 @@ func (e *Echo) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	c.Reset(r, w)
 
 	method := r.Method
-	path := r.URL.RawPath
-	if path == "" {
-		path = r.URL.Path
-	}
 	h := NotFoundHandler
 
 	if e.premiddleware == nil {
+		path := r.URL.RawPath
+		if path == "" {
+			path = r.URL.Path
+		}
 		e.router.Find(method, path, c)
 		h = c.Handler()
 		for i := len(e.middleware) - 1; i >= 0; i-- {
 			h = e.middleware[i](h)
 		}
 	} else {
 		h = func(c Context) error {
+			path := r.URL.RawPath
+			if path == "" {
+				path = r.URL.Path
+			}
 			e.router.Find(method, path, c)
 			h := c.Handler()
 			for i := len(e.middleware) - 1; i >= 0; i-- {

middleware/rewrite_test.go

@@ -33,3 +33,28 @@ func TestRewrite(t *testing.T) {
 	e.ServeHTTP(rec, req)
 	assert.Equal(t, "/user/jack/order/1", req.URL.Path)
 }
+
+//Issue #1086
+func TestEchoRewritePreMiddleware(t *testing.T) {
+	e := echo.New()
+	r := e.Router()
+
+	// Rewrite old url to new one
+	e.Pre(RewriteWithConfig(RewriteConfig{
+		Rules: map[string]string{
+			"/old": "/new",
+		},
+	}))
+
+	// Route
+	r.Add(echo.GET, "/new", func(c echo.Context) error {
+		return c.NoContent(200)
+		return nil
+	})
+
+	req := httptest.NewRequest(echo.GET, "/old", nil)
+	rec := httptest.NewRecorder()
+	e.ServeHTTP(rec, req)
+	assert.Equal(t, "/new", req.URL.Path)
+	assert.Equal(t, 200, rec.Code)
+}