mirror of
https://github.com/imgproxy/imgproxy.git
synced 2025-01-18 11:12:10 +02:00
Go 1.9 support is back
This commit is contained in:
parent
c3a1bdf259
commit
be56674fbe
11
etag.go
11
etag.go
@ -1,7 +1,6 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"crypto/sha256"
|
||||
"encoding/hex"
|
||||
@ -18,8 +17,8 @@ type etagPool struct {
|
||||
type etagPoolEntry struct {
|
||||
hash hash.Hash
|
||||
enc *json.Encoder
|
||||
buf *bytes.Buffer
|
||||
next *etagPoolEntry
|
||||
b []byte
|
||||
}
|
||||
|
||||
func newEtagPool(n int) *etagPool {
|
||||
@ -42,7 +41,7 @@ func (p *etagPool) grow() {
|
||||
p.top = &etagPoolEntry{
|
||||
hash: h,
|
||||
enc: enc,
|
||||
buf: new(bytes.Buffer),
|
||||
b: make([]byte, 64),
|
||||
next: p.top,
|
||||
}
|
||||
}
|
||||
@ -85,9 +84,7 @@ func calcETag(ctx context.Context) ([]byte, context.CancelFunc) {
|
||||
c.enc.Encode(conf)
|
||||
c.enc.Encode(getProcessingOptions(ctx))
|
||||
|
||||
c.buf.Reset()
|
||||
enc := hex.NewEncoder(c.buf)
|
||||
enc.Write(c.hash.Sum(nil))
|
||||
hex.Encode(c.b, c.hash.Sum(nil))
|
||||
|
||||
return c.buf.Bytes(), cancel
|
||||
return c.b, cancel
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user