summaryrefslogtreecommitdiff
path: root/vendor/github.com/gorilla/websocket/compression.go
diff options
context:
space:
mode:
authorLibravatar dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>2023-11-28 11:05:07 +0000
committerLibravatar GitHub <noreply@github.com>2023-11-28 11:05:07 +0000
commit2eb8b8eeb41384dbf34989d7a850b4d498d90064 (patch)
tree132bd8b2504744945a5af0808782b43163044f69 /vendor/github.com/gorilla/websocket/compression.go
parent[bugfix] Don't copy ptr fields in caches (#2386) (diff)
downloadgotosocial-2eb8b8eeb41384dbf34989d7a850b4d498d90064.tar.xz
[chore]: Bump github.com/gorilla/websocket from 1.5.0 to 1.5.1 (#2335)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: kim <grufwub@gmail.com>
Diffstat (limited to 'vendor/github.com/gorilla/websocket/compression.go')
-rw-r--r--vendor/github.com/gorilla/websocket/compression.go9
1 files changed, 7 insertions, 2 deletions
diff --git a/vendor/github.com/gorilla/websocket/compression.go b/vendor/github.com/gorilla/websocket/compression.go
index 813ffb1e8..9fed0ef52 100644
--- a/vendor/github.com/gorilla/websocket/compression.go
+++ b/vendor/github.com/gorilla/websocket/compression.go
@@ -8,6 +8,7 @@ import (
"compress/flate"
"errors"
"io"
+ "log"
"strings"
"sync"
)
@@ -33,7 +34,9 @@ func decompressNoContextTakeover(r io.Reader) io.ReadCloser {
"\x01\x00\x00\xff\xff"
fr, _ := flateReaderPool.Get().(io.ReadCloser)
- fr.(flate.Resetter).Reset(io.MultiReader(r, strings.NewReader(tail)), nil)
+ if err := fr.(flate.Resetter).Reset(io.MultiReader(r, strings.NewReader(tail)), nil); err != nil {
+ panic(err)
+ }
return &flateReadWrapper{fr}
}
@@ -132,7 +135,9 @@ func (r *flateReadWrapper) Read(p []byte) (int, error) {
// Preemptively place the reader back in the pool. This helps with
// scenarios where the application does not call NextReader() soon after
// this final read.
- r.Close()
+ if err := r.Close(); err != nil {
+ log.Printf("websocket: flateReadWrapper.Close() returned error: %v", err)
+ }
}
return n, err
}