From c11ffb2e09113924656128f8eb046bda97c55ed1 Mon Sep 17 00:00:00 2001 From: Jeremy Saenz Date: Fri, 25 Apr 2014 11:23:28 -0700 Subject: [PATCH 1/2] Revert "pass all not written routes to NotFound handler" This reverts commit d68dc967526f945e250e2d1e6c337648374dc4db. --- router.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/router.go b/router.go index 2d7964f..2d2f262 100644 --- a/router.go +++ b/router.go @@ -110,11 +110,7 @@ func (r *router) Handle(res http.ResponseWriter, req *http.Request, context Cont params := Params(vals) context.Map(params) route.Handle(context, res) - if context.Written() { - return - } else { - break - } + return } } From 5f090c9edf8770a0b11523618936d7f8a2539be1 Mon Sep 17 00:00:00 2001 From: Jeremy Saenz Date: Fri, 25 Apr 2014 11:23:54 -0700 Subject: [PATCH 2/2] Revert ""fix" router tests" This reverts commit 4cbd720ebdc53d0852fb822ed21fa8d0ba40c959. --- router_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/router_test.go b/router_test.go index 7329fcd..9c18a65 100644 --- a/router_test.go +++ b/router_test.go @@ -125,6 +125,8 @@ func Test_Routing(t *testing.T) { router.Handle(recorder, req12, context12) router.Handle(recorder, req13, context13) expect(t, result, "foobarbatbarfoofezpopbapwappowwappowoptsfoobazzingagetbazzingapostbazzingagroupception") + expect(t, recorder.Code, http.StatusNotFound) + expect(t, recorder.Body.String(), "404 page not found\n") } func Test_RouterHandlerStatusCode(t *testing.T) {