diff options
author | Wim <wim@42.be> | 2019-06-16 23:33:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-16 23:33:25 +0200 |
commit | cb712ff37d3c20a21695e00c52fff213a6fd40b4 (patch) | |
tree | 0ba0ee4f55bf6ace2656562465cc82d807e741b9 /vendor/github.com/labstack/echo/v4/context.go | |
parent | f4ae61044888f591830e6c1be9a2bdb14f88943e (diff) | |
download | matterbridge-msglm-cb712ff37d3c20a21695e00c52fff213a6fd40b4.tar.gz matterbridge-msglm-cb712ff37d3c20a21695e00c52fff213a6fd40b4.tar.bz2 matterbridge-msglm-cb712ff37d3c20a21695e00c52fff213a6fd40b4.zip |
Update vendor (#852)
Diffstat (limited to 'vendor/github.com/labstack/echo/v4/context.go')
-rw-r--r-- | vendor/github.com/labstack/echo/v4/context.go | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/vendor/github.com/labstack/echo/v4/context.go b/vendor/github.com/labstack/echo/v4/context.go index d4722700..065f5815 100644 --- a/vendor/github.com/labstack/echo/v4/context.go +++ b/vendor/github.com/labstack/echo/v4/context.go @@ -13,6 +13,7 @@ import ( "os" "path/filepath" "strings" + "sync" ) type ( @@ -198,6 +199,7 @@ type ( handler HandlerFunc store Map echo *Echo + lock sync.RWMutex } ) @@ -232,7 +234,7 @@ func (c *context) IsTLS() bool { func (c *context) IsWebSocket() bool { upgrade := c.request.Header.Get(HeaderUpgrade) - return upgrade == "websocket" || upgrade == "Websocket" + return strings.ToLower(upgrade) == "websocket" } func (c *context) Scheme() string { @@ -360,10 +362,15 @@ func (c *context) Cookies() []*http.Cookie { } func (c *context) Get(key string) interface{} { + c.lock.RLock() + defer c.lock.RUnlock() return c.store[key] } func (c *context) Set(key string, val interface{}) { + c.lock.Lock() + defer c.lock.Unlock() + if c.store == nil { c.store = make(Map) } @@ -430,7 +437,7 @@ func (c *context) json(code int, i interface{}, indent string) error { enc.SetIndent("", indent) } c.writeContentType(MIMEApplicationJSONCharsetUTF8) - c.response.WriteHeader(code) + c.response.Status = code return enc.Encode(i) } @@ -597,4 +604,3 @@ func (c *context) Reset(r *http.Request, w http.ResponseWriter) { // NOTE: Don't reset because it has to have length c.echo.maxParam at all times // c.pvalues = nil } - |