Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion context.go
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,8 @@ func (c *context) IsTLS() bool {

func (c *context) IsWebSocket() bool {
upgrade := c.request.Header.Get(HeaderUpgrade)
return strings.EqualFold(upgrade, "websocket")
connection := c.request.Header.Get(HeaderConnection)
return strings.EqualFold(upgrade, "websocket") && strings.Contains(strings.ToLower(connection), "upgrade")
}

func (c *context) Scheme() string {
Expand Down
21 changes: 19 additions & 2 deletions context_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -969,15 +969,21 @@ func TestContext_IsWebSocket(t *testing.T) {
{
&context{
request: &http.Request{
Header: http.Header{HeaderUpgrade: []string{"websocket"}},
Header: http.Header{
HeaderUpgrade: []string{"websocket"},
HeaderConnection: []string{"upgrade"},
},
},
},
assert.True,
},
{
&context{
request: &http.Request{
Header: http.Header{HeaderUpgrade: []string{"Websocket"}},
Header: http.Header{
HeaderUpgrade: []string{"Websocket"},
HeaderConnection: []string{"Upgrade"},
},
},
},
assert.True,
Expand All @@ -996,6 +1002,17 @@ func TestContext_IsWebSocket(t *testing.T) {
},
assert.False,
},
{
&context{
request: &http.Request{
Header: http.Header{
HeaderUpgrade: []string{"websocket"},
HeaderConnection: []string{"close"},
},
},
},
assert.False,
},
}

for i, tt := range tests {
Expand Down