|
|
@@ -193,7 +193,7 @@ func (h *ResponseHeader) SetConnectionClose() {
|
|
|
func (h *ResponseHeader) ResetConnectionClose() {
|
|
|
if h.connectionClose {
|
|
|
h.connectionClose = false
|
|
|
- h.h = delAllArgsBytes(h.h, strConnection)
|
|
|
+ h.h = delAllArgs(h.h, HeaderConnection)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -211,7 +211,7 @@ func (h *RequestHeader) SetConnectionClose() {
|
|
|
func (h *RequestHeader) ResetConnectionClose() {
|
|
|
if h.connectionClose {
|
|
|
h.connectionClose = false
|
|
|
- h.h = delAllArgsBytes(h.h, strConnection)
|
|
|
+ h.h = delAllArgs(h.h, HeaderConnection)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -251,7 +251,7 @@ func (h *ResponseHeader) SetContentLength(contentLength int) {
|
|
|
h.contentLength = contentLength
|
|
|
if contentLength >= 0 {
|
|
|
h.contentLengthBytes = AppendUint(h.contentLengthBytes[:0], contentLength)
|
|
|
- h.h = delAllArgsBytes(h.h, strTransferEncoding)
|
|
|
+ h.h = delAllArgs(h.h, HeaderTransferEncoding)
|
|
|
return
|
|
|
} else if contentLength == -1 {
|
|
|
h.contentLengthBytes = h.contentLengthBytes[:0]
|
|
|
@@ -296,7 +296,7 @@ func (h *RequestHeader) SetContentLength(contentLength int) {
|
|
|
h.contentLength = contentLength
|
|
|
if contentLength >= 0 {
|
|
|
h.contentLengthBytes = AppendUint(h.contentLengthBytes[:0], contentLength)
|
|
|
- h.h = delAllArgsBytes(h.h, strTransferEncoding)
|
|
|
+ h.h = delAllArgs(h.h, HeaderTransferEncoding)
|
|
|
} else {
|
|
|
h.contentLengthBytes = h.contentLengthBytes[:0]
|
|
|
h.h = setArgBytes(h.h, strTransferEncoding, strChunked, argsHasValue)
|
|
|
@@ -520,38 +520,8 @@ var ErrBadTrailer = errors.New("contain forbidden trailer")
|
|
|
// 6. determining how to process the payload (e.g., Content-Encoding, Content-Type, Content-Range, and Trailer)
|
|
|
//
|
|
|
// Return ErrBadTrailer if contain any forbidden trailers.
|
|
|
-func (h *ResponseHeader) AddTrailerBytes(trailer []byte) error {
|
|
|
- var err error
|
|
|
- for i := -1; i+1 < len(trailer); {
|
|
|
- trailer = trailer[i+1:]
|
|
|
- i = bytes.IndexByte(trailer, ',')
|
|
|
- if i < 0 {
|
|
|
- i = len(trailer)
|
|
|
- }
|
|
|
- key := trailer[:i]
|
|
|
- for len(key) > 0 && key[0] == ' ' {
|
|
|
- key = key[1:]
|
|
|
- }
|
|
|
- for len(key) > 0 && key[len(key)-1] == ' ' {
|
|
|
- key = key[:len(key)-1]
|
|
|
- }
|
|
|
- // Forbidden by RFC 7230, section 4.1.2
|
|
|
- if isBadTrailer(key) {
|
|
|
- err = ErrBadTrailer
|
|
|
- continue
|
|
|
- }
|
|
|
- h.bufK = append(h.bufK[:0], key...)
|
|
|
- normalizeHeaderKey(h.bufK, h.disableNormalizing)
|
|
|
- if cap(h.trailer) > len(h.trailer) {
|
|
|
- h.trailer = h.trailer[:len(h.trailer)+1]
|
|
|
- h.trailer[len(h.trailer)-1] = append(h.trailer[len(h.trailer)-1][:0], h.bufK...)
|
|
|
- } else {
|
|
|
- key = make([]byte, len(h.bufK))
|
|
|
- copy(key, h.bufK)
|
|
|
- h.trailer = append(h.trailer, key)
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
+func (h *ResponseHeader) AddTrailerBytes(trailer []byte) (err error) {
|
|
|
+ h.bufK, h.trailer, err = addTrailerBytes(trailer, h.bufK, h.trailer, h.disableNormalizing)
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
@@ -875,38 +845,8 @@ func (h *RequestHeader) AddTrailer(trailer string) error {
|
|
|
// 6. determining how to process the payload (e.g., Content-Encoding, Content-Type, Content-Range, and Trailer)
|
|
|
//
|
|
|
// Return ErrBadTrailer if contain any forbidden trailers.
|
|
|
-func (h *RequestHeader) AddTrailerBytes(trailer []byte) error {
|
|
|
- var err error
|
|
|
- for i := -1; i+1 < len(trailer); {
|
|
|
- trailer = trailer[i+1:]
|
|
|
- i = bytes.IndexByte(trailer, ',')
|
|
|
- if i < 0 {
|
|
|
- i = len(trailer)
|
|
|
- }
|
|
|
- key := trailer[:i]
|
|
|
- for len(key) > 0 && key[0] == ' ' {
|
|
|
- key = key[1:]
|
|
|
- }
|
|
|
- for len(key) > 0 && key[len(key)-1] == ' ' {
|
|
|
- key = key[:len(key)-1]
|
|
|
- }
|
|
|
- // Forbidden by RFC 7230, section 4.1.2
|
|
|
- if isBadTrailer(key) {
|
|
|
- err = ErrBadTrailer
|
|
|
- continue
|
|
|
- }
|
|
|
- h.bufK = append(h.bufK[:0], key...)
|
|
|
- normalizeHeaderKey(h.bufK, h.disableNormalizing)
|
|
|
- if cap(h.trailer) > len(h.trailer) {
|
|
|
- h.trailer = h.trailer[:len(h.trailer)+1]
|
|
|
- h.trailer[len(h.trailer)-1] = append(h.trailer[len(h.trailer)-1][:0], h.bufK...)
|
|
|
- } else {
|
|
|
- key = make([]byte, len(h.bufK))
|
|
|
- copy(key, h.bufK)
|
|
|
- h.trailer = append(h.trailer, key)
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
+func (h *RequestHeader) AddTrailerBytes(trailer []byte) (err error) {
|
|
|
+ h.bufK, h.trailer, err = addTrailerBytes(trailer, h.bufK, h.trailer, h.disableNormalizing)
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
@@ -1321,8 +1261,8 @@ func (h *RequestHeader) VisitAll(f func(key, value []byte)) {
|
|
|
func (h *RequestHeader) VisitAllInOrder(f func(key, value []byte)) {
|
|
|
var s headerScanner
|
|
|
s.b = h.rawHeaders
|
|
|
- s.disableNormalizing = h.disableNormalizing
|
|
|
for s.next() {
|
|
|
+ normalizeHeaderKey(s.key, h.disableNormalizing || bytes.IndexByte(s.key, ' ') != -1)
|
|
|
if len(s.key) > 0 {
|
|
|
f(s.key, s.value)
|
|
|
}
|
|
|
@@ -1338,7 +1278,7 @@ func (h *ResponseHeader) Del(key string) {
|
|
|
// DelBytes deletes header with the given key.
|
|
|
func (h *ResponseHeader) DelBytes(key []byte) {
|
|
|
h.bufK = append(h.bufK[:0], key...)
|
|
|
- normalizeHeaderKey(h.bufK, h.disableNormalizing)
|
|
|
+ normalizeHeaderKey(h.bufK, h.disableNormalizing || bytes.IndexByte(key, ' ') != -1)
|
|
|
h.del(h.bufK)
|
|
|
}
|
|
|
|
|
|
@@ -1360,7 +1300,7 @@ func (h *ResponseHeader) del(key []byte) {
|
|
|
case HeaderTrailer:
|
|
|
h.trailer = h.trailer[:0]
|
|
|
}
|
|
|
- h.h = delAllArgsBytes(h.h, key)
|
|
|
+ h.h = delAllArgs(h.h, b2s(key))
|
|
|
}
|
|
|
|
|
|
// Del deletes header with the given key.
|
|
|
@@ -1372,7 +1312,7 @@ func (h *RequestHeader) Del(key string) {
|
|
|
// DelBytes deletes header with the given key.
|
|
|
func (h *RequestHeader) DelBytes(key []byte) {
|
|
|
h.bufK = append(h.bufK[:0], key...)
|
|
|
- normalizeHeaderKey(h.bufK, h.disableNormalizing)
|
|
|
+ normalizeHeaderKey(h.bufK, h.disableNormalizing || bytes.IndexByte(key, ' ') != -1)
|
|
|
h.del(h.bufK)
|
|
|
}
|
|
|
|
|
|
@@ -1394,7 +1334,7 @@ func (h *RequestHeader) del(key []byte) {
|
|
|
case HeaderTrailer:
|
|
|
h.trailer = h.trailer[:0]
|
|
|
}
|
|
|
- h.h = delAllArgsBytes(h.h, key)
|
|
|
+ h.h = delAllArgs(h.h, b2s(key))
|
|
|
}
|
|
|
|
|
|
// setSpecialHeader handles special headers and return true when a header is processed.
|
|
|
@@ -1638,7 +1578,7 @@ func (h *ResponseHeader) SetBytesV(key string, value []byte) {
|
|
|
// Use AddBytesKV for setting multiple header values under the same key.
|
|
|
func (h *ResponseHeader) SetBytesKV(key, value []byte) {
|
|
|
h.bufK = append(h.bufK[:0], key...)
|
|
|
- normalizeHeaderKey(h.bufK, h.disableNormalizing)
|
|
|
+ normalizeHeaderKey(h.bufK, h.disableNormalizing || bytes.IndexByte(key, ' ') != -1)
|
|
|
h.SetCanonical(h.bufK, value)
|
|
|
}
|
|
|
|
|
|
@@ -1864,7 +1804,7 @@ func (h *RequestHeader) SetBytesV(key string, value []byte) {
|
|
|
// Use AddBytesKV for setting multiple header values under the same key.
|
|
|
func (h *RequestHeader) SetBytesKV(key, value []byte) {
|
|
|
h.bufK = append(h.bufK[:0], key...)
|
|
|
- normalizeHeaderKey(h.bufK, h.disableNormalizing)
|
|
|
+ normalizeHeaderKey(h.bufK, h.disableNormalizing || bytes.IndexByte(key, ' ') != -1)
|
|
|
h.SetCanonical(h.bufK, value)
|
|
|
}
|
|
|
|
|
|
@@ -1900,7 +1840,7 @@ func (h *ResponseHeader) Peek(key string) []byte {
|
|
|
// Do not store references to returned value. Make copies instead.
|
|
|
func (h *ResponseHeader) PeekBytes(key []byte) []byte {
|
|
|
h.bufK = append(h.bufK[:0], key...)
|
|
|
- normalizeHeaderKey(h.bufK, h.disableNormalizing)
|
|
|
+ normalizeHeaderKey(h.bufK, h.disableNormalizing || bytes.IndexByte(key, ' ') != -1)
|
|
|
return h.peek(h.bufK)
|
|
|
}
|
|
|
|
|
|
@@ -1921,7 +1861,7 @@ func (h *RequestHeader) Peek(key string) []byte {
|
|
|
// Do not store references to returned value. Make copies instead.
|
|
|
func (h *RequestHeader) PeekBytes(key []byte) []byte {
|
|
|
h.bufK = append(h.bufK[:0], key...)
|
|
|
- normalizeHeaderKey(h.bufK, h.disableNormalizing)
|
|
|
+ normalizeHeaderKey(h.bufK, h.disableNormalizing || bytes.IndexByte(key, ' ') != -1)
|
|
|
return h.peek(h.bufK)
|
|
|
}
|
|
|
|
|
|
@@ -2239,7 +2179,8 @@ func (h *ResponseHeader) tryReadTrailer(r *bufio.Reader, n int) error {
|
|
|
return fmt.Errorf("error when reading response trailer: %w", err)
|
|
|
}
|
|
|
b = mustPeekBuffered(r)
|
|
|
- headersLen, errParse := h.parseTrailer(b)
|
|
|
+ trailers, headersLen, errParse := parseTrailer(b, h.h, h.disableNormalizing)
|
|
|
+ h.h = trailers
|
|
|
if errParse != nil {
|
|
|
if err == io.EOF {
|
|
|
return err
|
|
|
@@ -2348,7 +2289,8 @@ func (h *RequestHeader) tryReadTrailer(r *bufio.Reader, n int) error {
|
|
|
return fmt.Errorf("error when reading request trailer: %w", err)
|
|
|
}
|
|
|
b = mustPeekBuffered(r)
|
|
|
- headersLen, errParse := h.parseTrailer(b)
|
|
|
+ trailers, headersLen, errParse := parseTrailer(b, h.h, h.disableNormalizing)
|
|
|
+ h.h = trailers
|
|
|
if errParse != nil {
|
|
|
if err == io.EOF {
|
|
|
return err
|
|
|
@@ -2725,43 +2667,6 @@ func (h *ResponseHeader) parse(buf []byte) (int, error) {
|
|
|
return m + n, nil
|
|
|
}
|
|
|
|
|
|
-func (h *ResponseHeader) parseTrailer(buf []byte) (int, error) {
|
|
|
- // Skip any 0 length chunk.
|
|
|
- if buf[0] == '0' {
|
|
|
- skip := len(strCRLF) + 1
|
|
|
- if len(buf) < skip {
|
|
|
- return 0, io.EOF
|
|
|
- }
|
|
|
- buf = buf[skip:]
|
|
|
- }
|
|
|
-
|
|
|
- var s headerScanner
|
|
|
- s.b = buf
|
|
|
- s.disableNormalizing = h.disableNormalizing
|
|
|
- var err error
|
|
|
- for s.next() {
|
|
|
- if len(s.key) > 0 {
|
|
|
- if bytes.IndexByte(s.key, ' ') != -1 || bytes.IndexByte(s.key, '\t') != -1 {
|
|
|
- err = fmt.Errorf("invalid trailer key %q", s.key)
|
|
|
- continue
|
|
|
- }
|
|
|
- // Forbidden by RFC 7230, section 4.1.2
|
|
|
- if isBadTrailer(s.key) {
|
|
|
- err = fmt.Errorf("forbidden trailer key %q", s.key)
|
|
|
- continue
|
|
|
- }
|
|
|
- h.h = appendArgBytes(h.h, s.key, s.value, argsHasValue)
|
|
|
- }
|
|
|
- }
|
|
|
- if s.err != nil {
|
|
|
- return 0, s.err
|
|
|
- }
|
|
|
- if err != nil {
|
|
|
- return 0, err
|
|
|
- }
|
|
|
- return s.hLen, nil
|
|
|
-}
|
|
|
-
|
|
|
func (h *RequestHeader) ignoreBody() bool {
|
|
|
return h.IsGet() || h.IsHead()
|
|
|
}
|
|
|
@@ -2784,41 +2689,82 @@ func (h *RequestHeader) parse(buf []byte) (int, error) {
|
|
|
return m + n, nil
|
|
|
}
|
|
|
|
|
|
-func (h *RequestHeader) parseTrailer(buf []byte) (int, error) {
|
|
|
+func addTrailerBytes(src, buf []byte, trailers [][]byte, disableNormalizing bool) ([]byte, [][]byte, error) {
|
|
|
+ var err error
|
|
|
+ for i := -1; i+1 < len(src); {
|
|
|
+ src = src[i+1:]
|
|
|
+ i = bytes.IndexByte(src, ',')
|
|
|
+ if i < 0 {
|
|
|
+ i = len(src)
|
|
|
+ }
|
|
|
+ key := src[:i]
|
|
|
+ for len(key) > 0 && key[0] == ' ' {
|
|
|
+ key = key[1:]
|
|
|
+ }
|
|
|
+ for len(key) > 0 && key[len(key)-1] == ' ' {
|
|
|
+ key = key[:len(key)-1]
|
|
|
+ }
|
|
|
+ // Forbidden by RFC 7230, section 4.1.2
|
|
|
+ if isBadTrailer(key) {
|
|
|
+ err = ErrBadTrailer
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ buf = append(buf[:0], key...)
|
|
|
+ normalizeHeaderKey(buf, disableNormalizing || bytes.IndexByte(buf, ' ') != -1)
|
|
|
+ if cap(trailers) > len(trailers) {
|
|
|
+ trailers = trailers[:len(trailers)+1]
|
|
|
+ trailers[len(trailers)-1] = append(trailers[len(trailers)-1][:0], buf...)
|
|
|
+ } else {
|
|
|
+ key = make([]byte, len(buf))
|
|
|
+ copy(key, buf)
|
|
|
+ trailers = append(trailers, key)
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return buf, trailers, err
|
|
|
+}
|
|
|
+
|
|
|
+func parseTrailer(src []byte, dest []argsKV, disableNormalizing bool) ([]argsKV, int, error) {
|
|
|
// Skip any 0 length chunk.
|
|
|
- if buf[0] == '0' {
|
|
|
+ if src[0] == '0' {
|
|
|
skip := len(strCRLF) + 1
|
|
|
- if len(buf) < skip {
|
|
|
- return 0, io.EOF
|
|
|
+ if len(src) < skip {
|
|
|
+ return dest, 0, io.EOF
|
|
|
}
|
|
|
- buf = buf[skip:]
|
|
|
+ src = src[skip:]
|
|
|
}
|
|
|
|
|
|
var s headerScanner
|
|
|
- s.b = buf
|
|
|
- s.disableNormalizing = h.disableNormalizing
|
|
|
- var err error
|
|
|
+ s.b = src
|
|
|
+
|
|
|
for s.next() {
|
|
|
- if len(s.key) > 0 {
|
|
|
- if bytes.IndexByte(s.key, ' ') != -1 || bytes.IndexByte(s.key, '\t') != -1 {
|
|
|
- err = fmt.Errorf("invalid trailer key %q", s.key)
|
|
|
- continue
|
|
|
- }
|
|
|
- // Forbidden by RFC 7230, section 4.1.2
|
|
|
- if isBadTrailer(s.key) {
|
|
|
- err = fmt.Errorf("forbidden trailer key %q", s.key)
|
|
|
- continue
|
|
|
+ if len(s.key) == 0 {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ disable := disableNormalizing
|
|
|
+ for _, ch := range s.key {
|
|
|
+ if !validHeaderFieldByte(ch) {
|
|
|
+ // We accept invalid headers with a space before the
|
|
|
+ // colon, but must not canonicalize them.
|
|
|
+ // See: https://github.com/valyala/fasthttp/issues/1917
|
|
|
+ if ch == ' ' {
|
|
|
+ disable = true
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ return dest, 0, fmt.Errorf("invalid trailer key %q", s.key)
|
|
|
}
|
|
|
- h.h = appendArgBytes(h.h, s.key, s.value, argsHasValue)
|
|
|
}
|
|
|
+ // Forbidden by RFC 7230, section 4.1.2
|
|
|
+ if isBadTrailer(s.key) {
|
|
|
+ return dest, 0, fmt.Errorf("forbidden trailer key %q", s.key)
|
|
|
+ }
|
|
|
+ normalizeHeaderKey(s.key, disable)
|
|
|
+ dest = appendArgBytes(dest, s.key, s.value, argsHasValue)
|
|
|
}
|
|
|
if s.err != nil {
|
|
|
- return 0, s.err
|
|
|
- }
|
|
|
- if err != nil {
|
|
|
- return 0, err
|
|
|
+ return dest, 0, s.err
|
|
|
}
|
|
|
- return s.hLen, nil
|
|
|
+ return dest, s.hLen, nil
|
|
|
}
|
|
|
|
|
|
func isBadTrailer(key []byte) bool {
|
|
|
@@ -3019,7 +2965,6 @@ func (h *ResponseHeader) parseHeaders(buf []byte) (int, error) {
|
|
|
|
|
|
var s headerScanner
|
|
|
s.b = buf
|
|
|
- s.disableNormalizing = h.disableNormalizing
|
|
|
var kv *argsKV
|
|
|
|
|
|
for s.next() {
|
|
|
@@ -3028,12 +2973,22 @@ func (h *ResponseHeader) parseHeaders(buf []byte) (int, error) {
|
|
|
return 0, fmt.Errorf("invalid header key %q", s.key)
|
|
|
}
|
|
|
|
|
|
+ disableNormalizing := h.disableNormalizing
|
|
|
for _, ch := range s.key {
|
|
|
if !validHeaderFieldByte(ch) {
|
|
|
h.connectionClose = true
|
|
|
+ // We accept invalid headers with a space before the
|
|
|
+ // colon, but must not canonicalize them.
|
|
|
+ // See: https://github.com/valyala/fasthttp/issues/1917
|
|
|
+ if ch == ' ' {
|
|
|
+ disableNormalizing = true
|
|
|
+ continue
|
|
|
+ }
|
|
|
return 0, fmt.Errorf("invalid header key %q", s.key)
|
|
|
}
|
|
|
}
|
|
|
+ normalizeHeaderKey(s.key, disableNormalizing)
|
|
|
+
|
|
|
for _, ch := range s.value {
|
|
|
if !validHeaderValueByte(ch) {
|
|
|
h.connectionClose = true
|
|
|
@@ -3136,7 +3091,6 @@ func (h *RequestHeader) parseHeaders(buf []byte) (int, error) {
|
|
|
|
|
|
var s headerScanner
|
|
|
s.b = buf
|
|
|
- s.disableNormalizing = h.disableNormalizing
|
|
|
|
|
|
for s.next() {
|
|
|
if len(s.key) == 0 {
|
|
|
@@ -3144,12 +3098,19 @@ func (h *RequestHeader) parseHeaders(buf []byte) (int, error) {
|
|
|
return 0, fmt.Errorf("invalid header key %q", s.key)
|
|
|
}
|
|
|
|
|
|
+ disableNormalizing := h.disableNormalizing
|
|
|
for _, ch := range s.key {
|
|
|
if !validHeaderFieldByte(ch) {
|
|
|
+ if ch == ' ' {
|
|
|
+ disableNormalizing = true
|
|
|
+ continue
|
|
|
+ }
|
|
|
h.connectionClose = true
|
|
|
return 0, fmt.Errorf("invalid header key %q", s.key)
|
|
|
}
|
|
|
}
|
|
|
+ normalizeHeaderKey(s.key, disableNormalizing)
|
|
|
+
|
|
|
for _, ch := range s.value {
|
|
|
if !validHeaderValueByte(ch) {
|
|
|
h.connectionClose = true
|
|
|
@@ -3304,8 +3265,7 @@ type headerScanner struct {
|
|
|
nextColon int
|
|
|
nextNewLine int
|
|
|
|
|
|
- disableNormalizing bool
|
|
|
- initialized bool
|
|
|
+ initialized bool
|
|
|
}
|
|
|
|
|
|
func (s *headerScanner) next() bool {
|
|
|
@@ -3351,7 +3311,6 @@ func (s *headerScanner) next() bool {
|
|
|
return false
|
|
|
}
|
|
|
s.key = s.b[:n]
|
|
|
- normalizeHeaderKey(s.key, s.disableNormalizing)
|
|
|
n++
|
|
|
for len(s.b) > n && (s.b[n] == ' ' || s.b[n] == '\t') {
|
|
|
n++
|
|
|
@@ -3372,11 +3331,7 @@ func (s *headerScanner) next() bool {
|
|
|
s.err = errNeedMore
|
|
|
return false
|
|
|
}
|
|
|
- isMultiLineValue := false
|
|
|
- for {
|
|
|
- if n+1 >= len(s.b) {
|
|
|
- break
|
|
|
- }
|
|
|
+ for n+1 < len(s.b) {
|
|
|
if s.b[n+1] != ' ' && s.b[n+1] != '\t' {
|
|
|
break
|
|
|
}
|
|
|
@@ -3392,14 +3347,12 @@ func (s *headerScanner) next() bool {
|
|
|
s.nextNewLine = d - c - 1
|
|
|
break
|
|
|
}
|
|
|
- isMultiLineValue = true
|
|
|
n = e
|
|
|
}
|
|
|
if n >= len(s.b) {
|
|
|
s.err = errNeedMore
|
|
|
return false
|
|
|
}
|
|
|
- oldB := s.b
|
|
|
s.value = s.b[:n]
|
|
|
s.hLen += n + 1
|
|
|
s.b = s.b[n+1:]
|
|
|
@@ -3411,8 +3364,8 @@ func (s *headerScanner) next() bool {
|
|
|
n--
|
|
|
}
|
|
|
s.value = s.value[:n]
|
|
|
- if isMultiLineValue {
|
|
|
- s.value, s.b, s.hLen = normalizeHeaderValue(s.value, oldB, s.hLen)
|
|
|
+ if bytes.Contains(s.b, strCRLF) {
|
|
|
+ s.value = normalizeHeaderValue(s.value)
|
|
|
}
|
|
|
|
|
|
return true
|
|
|
@@ -3482,11 +3435,11 @@ func initHeaderKV(bufK, bufV []byte, key, value string, disableNormalizing bool)
|
|
|
|
|
|
func getHeaderKeyBytes(bufK []byte, key string, disableNormalizing bool) []byte {
|
|
|
bufK = append(bufK[:0], key...)
|
|
|
- normalizeHeaderKey(bufK, disableNormalizing)
|
|
|
+ normalizeHeaderKey(bufK, disableNormalizing || bytes.IndexByte(bufK, ' ') != -1)
|
|
|
return bufK
|
|
|
}
|
|
|
|
|
|
-func normalizeHeaderValue(ov, ob []byte, headerLength int) (nv, nb []byte, nhl int) {
|
|
|
+func normalizeHeaderValue(ov []byte) (nv []byte) {
|
|
|
nv = ov
|
|
|
length := len(ov)
|
|
|
if length <= 0 {
|
|
|
@@ -3521,23 +3474,8 @@ func normalizeHeaderValue(ov, ob []byte, headerLength int) (nv, nb []byte, nhl i
|
|
|
write++
|
|
|
}
|
|
|
|
|
|
- nv = nv[:write]
|
|
|
- copy(ob[write:], ob[write+shrunk:])
|
|
|
-
|
|
|
- // Check if we need to skip \r\n or just \n
|
|
|
- skip := 0
|
|
|
- if ob[write] == rChar {
|
|
|
- if ob[write+1] == nChar {
|
|
|
- skip += 2
|
|
|
- } else {
|
|
|
- skip++
|
|
|
- }
|
|
|
- } else if ob[write] == nChar {
|
|
|
- skip++
|
|
|
- }
|
|
|
+ nv = nv[:length-shrunk]
|
|
|
|
|
|
- nb = ob[write+skip : len(ob)-shrunk]
|
|
|
- nhl = headerLength - shrunk
|
|
|
return
|
|
|
}
|
|
|
|
SVI