blackteay/gin
3
0
Fork 0
mirror of https://github.com/gin-gonic/gin.git synced 2025-04-06 03:57:46 +08:00
Code Issues Projects Releases Wiki Activity

Merge 6e891029bf1128e0845ce64a111bd35f0682dcce into 8763f33c65f7df8be5b9fe7504ab7fcf20abb41d

Browse Source
This commit is contained in:
Javier Fabrizio 2025-03-23 09:37:12 +08:00 committed by GitHub
commit afa652c1bd
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

@ -1307,16 +1307,19 @@ func (c *Context) SetAccepted(formats ...string) {
/***** GOLANG.ORG/X/NET/CONTEXT *****/ /***** 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 { func (c *Context) hasRequestContext() bool {
hasFallback := c.engine != nil && c.engine.ContextWithFallback return c.Request != nil && c.Request.Context() != nil
hasRequestContext := c.Request != nil && c.Request.Context() != nil
return hasFallback && hasRequestContext
} }
// Deadline returns that there is no deadline (ok==false) when c.Request has no Context. // Deadline returns that there is no deadline (ok==false) when c.Request has no Context.
func (c *Context) Deadline() (deadline time.Time, ok bool) { func (c *Context) Deadline() (deadline time.Time, ok bool) {
if !c.hasRequestContext() { if !c.hasFallback() || !c.hasRequestContext() {
return return
} }
return c.Request.Context().Deadline() return c.Request.Context().Deadline()
@ -1324,7 +1327,7 @@ func (c *Context) Deadline() (deadline time.Time, ok bool) {
// Done returns nil (chan which will wait forever) when c.Request has no Context. // Done returns nil (chan which will wait forever) when c.Request has no Context.
func (c *Context) Done() <-chan struct{} { func (c *Context) Done() <-chan struct{} {
if !c.hasRequestContext() { if !c.hasFallback() || !c.hasRequestContext() {
return nil return nil
} }
return c.Request.Context().Done() return c.Request.Context().Done()
@ -1332,7 +1335,7 @@ func (c *Context) Done() <-chan struct{} {
// Err returns nil when c.Request has no Context. // Err returns nil when c.Request has no Context.
func (c *Context) Err() error { func (c *Context) Err() error {
if !c.hasRequestContext() { if !c.hasFallback() || !c.hasRequestContext() {
return nil return nil
} }
return c.Request.Context().Err() return c.Request.Context().Err()
@ -1353,7 +1356,7 @@ func (c *Context) Value(key any) any {
return val return val
} }
} }
if !c.hasRequestContext() { if !c.hasFallback() || !c.hasRequestContext() {
return nil return nil
} }
return c.Request.Context().Value(key) return c.Request.Context().Value(key)

32
context_test.go
View File

@ -2811,20 +2811,38 @@ func TestRemoteIPFail(t *testing.T) {
func TestHasRequestContext(t *testing.T) { func TestHasRequestContext(t *testing.T) {
c, _ := CreateTestContext(httptest.NewRecorder()) c, _ := CreateTestContext(httptest.NewRecorder())
assert.False(t, c.hasRequestContext(), "no request, no fallback") assert.False(t, c.hasRequestContext())
c.engine.ContextWithFallback = true 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) 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 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 c.engine.ContextWithFallback = false
assert.False(t, c.hasRequestContext(), "has request, no fallback") assert.False(t, c.hasRequestContext())
c = &Context{} c = &Context{}
assert.False(t, c.hasRequestContext(), "no request, no engine") assert.False(t, c.hasRequestContext())
c.Request, _ = http.NewRequest(http.MethodGet, "/", nil) 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) { func TestContextWithFallbackDeadlineFromRequestContext(t *testing.T) {