reverted PR #54 :timeout handling in timeout.go and timeout_test.go (#62

)

- Remove the import statement for "context" in timeout.go
- Remove the code block related to context cancellation in the New function in timeout.go
- Replace the case statement in the New function in timeout.go with a case statement using time.After
- Remove the import statement for "sync" in timeout_test.go
- Remove the TestDeadlineExceeded function in timeout_test.go

reverted PR #54 

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

timeout.go

@@ -1,7 +1,6 @@
 package timeout
 
 import (
-	"context"
 	"time"
 
 	"github.com/gin-gonic/gin"
@@ -47,10 +46,6 @@ func New(opts ...Option) gin.HandlerFunc {
 		c.Writer = tw
 		buffer.Reset()
 
-		ctx, cancel := context.WithTimeout(c, t.timeout)
-		c.Request = c.Request.WithContext(ctx)
-		defer cancel()
-
 		go func() {
 			defer func() {
 				if p := recover(); p != nil {
@@ -82,7 +77,7 @@ func New(opts ...Option) gin.HandlerFunc {
 			tw.FreeBuffer()
 			bufPool.Put(buffer)
 
-		case <-c.Request.Context().Done():
+		case <-time.After(t.timeout):
 			c.Abort()
 			tw.mu.Lock()
 			defer tw.mu.Unlock()

timeout_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"net/http"
 	"net/http/httptest"
-	"sync"
 	"testing"
 	"time"
 
@@ -101,36 +100,3 @@ func TestPanic(t *testing.T) {
 	assert.Equal(t, http.StatusInternalServerError, w.Code)
 	assert.Equal(t, "", w.Body.String())
 }
-
-func TestDeadlineExceeded(t *testing.T) {
-	var wg sync.WaitGroup
-	wg.Add(1)
-
-	r := gin.New()
-	r.GET("/", New(
-		WithTimeout(50*time.Millisecond),
-		WithHandler(func(c *gin.Context) {
-			defer wg.Done()
-			time.Sleep(100 * time.Millisecond)
-			assert.Equal(t, "value", c.Request.Header.Get("X-Test"))
-			assert.Equal(t, context.DeadlineExceeded, c.Request.Context().Err())
-			select {
-			case <-c.Request.Context().Done():
-				// OK
-			case <-time.After(1 * time.Second):
-				assert.Fail(t, "context is not done")
-			}
-		}),
-		WithResponse(testResponse),
-	))
-
-	w := httptest.NewRecorder()
-	req, _ := http.NewRequestWithContext(context.Background(), "GET", "/", nil)
-	req.Header.Set("X-Test", "value")
-	r.ServeHTTP(w, req)
-
-	assert.Equal(t, http.StatusRequestTimeout, w.Code)
-	assert.Equal(t, "test response", w.Body.String())
-
-	wg.Wait()
-}