blackteay/gin
3
0
Fork 0
mirror of https://github.com/gin-gonic/gin.git synced 2026-06-09 14:14:11 +08:00
Code Issues Projects Releases Wiki Activity

Merge 6e891029bf1128e0845ce64a111bd35f0682dcce into 5260de6a83283abb87e827130accd495ad543cf3

Browse Source
This commit is contained in:
Javier Fabrizio 2026-02-18 20:46:01 -08:00 committed by GitHub
commit 9f7ade9b79
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
context.go
View File

@ -1429,16 +1429,19 @@ func (c *Context) SetAccepted(formats ...string) {
/***** GOLANG.ORG/X/NET/CONTEXT *****/
/************************************/
// hasRequestContext returns whether c.Request has Context and fallback.
// hasFallback returns whether c.engine has ContextWithFallback.
func (c *Context) hasFallback() bool {
return c.engine != nil && c.engine.ContextWithFallback
}
// hasRequestContext returns whether c.Request has Context
func (c *Context) hasRequestContext() bool {
hasFallback := c.engine != nil && c.engine.ContextWithFallback
hasRequestContext := c.Request != nil && c.Request.Context() != nil
return hasFallback && hasRequestContext
return c.Request != nil && c.Request.Context() != nil
}
// Deadline returns that there is no deadline (ok==false) when c.Request has no Context.
func (c *Context) Deadline() (deadline time.Time, ok bool) {
if !c.hasRequestContext() {
if !c.hasFallback() || !c.hasRequestContext() {
return
}
return c.Request.Context().Deadline()
@ -1446,7 +1449,7 @@ func (c *Context) Deadline() (deadline time.Time, ok bool) {
// Done returns nil (chan which will wait forever) when c.Request has no Context.
func (c *Context) Done() <-chan struct{} {
if !c.hasRequestContext() {
if !c.hasFallback() || !c.hasRequestContext() {
return nil
}
return c.Request.Context().Done()
@ -1454,7 +1457,7 @@ func (c *Context) Done() <-chan struct{} {
// Err returns nil when c.Request has no Context.
func (c *Context) Err() error {
if !c.hasRequestContext() {
if !c.hasFallback() || !c.hasRequestContext() {
return nil
}
return c.Request.Context().Err()
@ -1475,7 +1478,7 @@ func (c *Context) Value(key any) any {
return val
}
}
if !c.hasRequestContext() {
if !c.hasFallback() || !c.hasRequestContext() {
return nil
}
return c.Request.Context().Value(key)

32
context_test.go
View File

@ -3098,20 +3098,38 @@ func TestRemoteIPFail(t *testing.T) {
func TestHasRequestContext(t *testing.T) {
c, _ := CreateTestContext(httptest.NewRecorder())
assert.False(t, c.hasRequestContext(), "no request, no fallback")
assert.False(t, c.hasRequestContext())
c.engine.ContextWithFallback = true
assert.False(t, c.hasRequestContext(), "no request, has fallback")
assert.False(t, c.hasRequestContext())
c.Request, _ = http.NewRequest(http.MethodGet, "/", nil)
assert.True(t, c.hasRequestContext(), "has request, has fallback")
assert.True(t, c.hasRequestContext())
c.Request, _ = http.NewRequestWithContext(nil, "", "", nil) //nolint:staticcheck
assert.False(t, c.hasRequestContext(), "has request with nil ctx, has fallback")
assert.False(t, c.hasRequestContext())
c.engine.ContextWithFallback = false
assert.False(t, c.hasRequestContext(), "has request, no fallback")
assert.False(t, c.hasRequestContext())
c = &Context{}
assert.False(t, c.hasRequestContext(), "no request, no engine")
assert.False(t, c.hasRequestContext())
c.Request, _ = http.NewRequest(http.MethodGet, "/", nil)
assert.False(t, c.hasRequestContext(), "has request, no engine")
assert.True(t, c.hasRequestContext())
}
func TestHasFallback(t *testing.T) {
c, _ := CreateTestContext(httptest.NewRecorder())
assert.False(t, c.hasFallback())
c.engine.ContextWithFallback = true
assert.True(t, c.hasFallback())
c.Request, _ = http.NewRequest(http.MethodGet, "/", nil)
assert.True(t, c.hasFallback())
c.Request, _ = http.NewRequestWithContext(nil, "", "", nil) //nolint:staticcheck
assert.True(t, c.hasFallback())
c.engine.ContextWithFallback = false
assert.False(t, c.hasFallback())
c = &Context{}
assert.False(t, c.hasFallback())
c.Request, _ = http.NewRequest(http.MethodGet, "/", nil)
assert.False(t, c.hasFallback())
}
func TestContextWithFallbackDeadlineFromRequestContext(t *testing.T) {