Revert logic change

gofiber · Mar 4, 2024 · c9a033c · c9a033c
1 parent d7fce2d
commit c9a033c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/middleware/favicon/favicon.go b/middleware/favicon/favicon.go
@@ -124,17 +124,18 @@ func New(config ...Config) fiber.Handler {
 			return c.Next()
 		}
 
-		// Only allow GET, HEAD, and OPTIONS requests
-		if c.Method() != fiber.MethodGet && c.Method() != fiber.MethodHead && c.Method() != fiber.MethodOptions {
-			c.Status(fiber.StatusMethodNotAllowed)
+		// Only allow GET, HEAD and OPTIONS requests
+		if c.Method() != fiber.MethodGet && c.Method() != fiber.MethodHead {
+			if c.Method() != fiber.MethodOptions {
+				c.Status(fiber.StatusMethodNotAllowed)
+			} else {
+				c.Status(fiber.StatusOK)
+			}
 			c.Set(fiber.HeaderAllow, hAllow)
+			c.Set(fiber.HeaderContentLength, hZero)
 			return nil
 		}
 
-		if c.Method() == fiber.MethodOptions {
-			return c.SendStatus(fiber.StatusOK)
-		}
-
 		// Serve cached favicon
 		if iconLen > 0 {
 			c.Set(fiber.HeaderContentLength, iconLenHeader)

diff --git a/middleware/proxy/proxy_test.go b/middleware/proxy/proxy_test.go
@@ -523,7 +523,7 @@ func Test_Proxy_DoDeadline_PastDeadline(t *testing.T) {
 
 	app := fiber.New()
 	app.Get("/test", func(c fiber.Ctx) error {
-		return DoDeadline(c, "http://"+addr, time.Now().Add(time.Second))
+		return DoDeadline(c, "http://"+addr, time.Now().Add(2*time.Second))
 	})
 
 	_, err1 := app.Test(httptest.NewRequest(fiber.MethodGet, "/test", nil), int((1*time.Second)/time.Millisecond))