1
0
mirror of https://github.com/gofiber/fiber.git synced 2025-02-23 10:03:45 +00:00

Merge pull request #566 from Fenny/master

🔧 Don't reset headers on ErrorHandler
This commit is contained in:
fenny 2020-07-08 15:15:22 -04:00 committed by GitHub
commit 6467e41889
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 6 additions and 13 deletions

View File

@ -642,7 +642,7 @@ func Test_App_Listen(t *testing.T) {
utils.AssertEqual(t, nil, app.Listen("4010")) utils.AssertEqual(t, nil, app.Listen("4010"))
} }
func Test_App_Serve(t *testing.T) { func Test_App_Listener(t *testing.T) {
app := New(&Settings{ app := New(&Settings{
DisableStartupMessage: true, DisableStartupMessage: true,
Prefork: true, Prefork: true,
@ -655,7 +655,7 @@ func Test_App_Serve(t *testing.T) {
utils.AssertEqual(t, nil, app.Shutdown()) utils.AssertEqual(t, nil, app.Shutdown())
}() }()
utils.AssertEqual(t, nil, app.Serve(ln)) utils.AssertEqual(t, nil, app.Listener(ln))
} }
// go test -v -run=^$ -bench=Benchmark_App_ETag -benchmem -count=4 // go test -v -run=^$ -bench=Benchmark_App_ETag -benchmem -count=4

1
ctx.go
View File

@ -605,7 +605,6 @@ func (ctx *Ctx) MultipartForm() (*multipart.Form, error) {
// You can pass an optional error for custom error handling. // You can pass an optional error for custom error handling.
func (ctx *Ctx) Next(err ...error) { func (ctx *Ctx) Next(err ...error) {
if len(err) > 0 { if len(err) > 0 {
ctx.Fasthttp.Response.Header.Reset()
ctx.err = err[0] ctx.err = err[0]
ctx.app.Settings.ErrorHandler(ctx, ctx.err) ctx.app.Settings.ErrorHandler(ctx, ctx.err)
return return

View File

@ -1120,7 +1120,7 @@ func Test_Ctx_Next_Error(t *testing.T) {
resp, err := app.Test(httptest.NewRequest(MethodGet, "http://example.com/test", nil)) resp, err := app.Test(httptest.NewRequest(MethodGet, "http://example.com/test", nil))
utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, nil, err, "app.Test(req)")
utils.AssertEqual(t, StatusNotFound, resp.StatusCode, "Status code") utils.AssertEqual(t, StatusNotFound, resp.StatusCode, "Status code")
utils.AssertEqual(t, "", resp.Header.Get("X-Next-Result")) utils.AssertEqual(t, "Works", resp.Header.Get("X-Next-Result"))
} }
// go test -run Test_Ctx_Redirect // go test -run Test_Ctx_Redirect

View File

@ -60,7 +60,7 @@ func Test_Middleware_Compress_Config(t *testing.T) {
func Test_Middleware_Compress_With_Config(t *testing.T) { func Test_Middleware_Compress_With_Config(t *testing.T) {
app := fiber.New() app := fiber.New()
app.Use(CompressWithConfig(CompressConfig{})) app.Use(Compress(CompressConfig{}))
app.Get("/", func(c *fiber.Ctx) { app.Get("/", func(c *fiber.Ctx) {
c.SendFile(compressFilePath(CompressLevelDefault), true) c.SendFile(compressFilePath(CompressLevelDefault), true)

View File

@ -114,7 +114,6 @@ $`)
Logger("15:04:05"), Logger("15:04:05"),
Logger("${time} ${method} ${path} - ${ip} - ${status} - ${latency}\n"), Logger("${time} ${method} ${path} - ${ip} - ${status} - ${latency}\n"),
Logger(LoggerConfig{Output: buf}), Logger(LoggerConfig{Output: buf}),
LoggerWithConfig(LoggerConfig{Output: buf}),
} }
for _, logger := range loggers { for _, logger := range loggers {

View File

@ -17,14 +17,14 @@ func Test_Middleware_Recover(t *testing.T) {
app.Use(Recover()) app.Use(Recover())
app.Get("/panic", func(ctx *fiber.Ctx) { app.Get("/panic", func(ctx *fiber.Ctx) {
ctx.Set("dummy", "this should not be here") ctx.Set("dummy", "this should be here")
panic("Hi, I'm an error!") panic("Hi, I'm an error!")
}) })
resp, err := app.Test(httptest.NewRequest("GET", "/panic", nil)) resp, err := app.Test(httptest.NewRequest("GET", "/panic", nil))
utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, nil, err, "app.Test(req)")
utils.AssertEqual(t, 500, resp.StatusCode, "Status code") utils.AssertEqual(t, 500, resp.StatusCode, "Status code")
utils.AssertEqual(t, "", resp.Header.Get("dummy")) utils.AssertEqual(t, "this should be here", resp.Header.Get("dummy"))
body, err := ioutil.ReadAll(resp.Body) body, err := ioutil.ReadAll(resp.Body)
utils.AssertEqual(t, nil, err) utils.AssertEqual(t, nil, err)

View File

@ -82,11 +82,6 @@ func Test_Middleware_RequestID_Options_And_WithConfig(t *testing.T) {
header: RequestIDConfigDefault.Header, header: RequestIDConfigDefault.Header,
handler: RequestID(func() string { return "fake-id" }), handler: RequestID(func() string { return "fake-id" }),
}, },
{
idLen: UUIDLen,
header: RequestIDConfigDefault.Header,
handler: RequestIDWithConfig(RequestIDConfig{}),
},
} }
for _, testCase := range testCases { for _, testCase := range testCases {