mirror of
https://github.com/XTLS/Xray-core.git
synced 2024-11-22 08:31:28 +00:00
adjust for go1.17
This commit is contained in:
parent
3213e5dd81
commit
e6019a89c9
|
@ -90,7 +90,7 @@ func (h *HeaderReader) Read(reader io.Reader) (*buf.Buffer, error) {
|
||||||
buffer.Clear()
|
buffer.Clear()
|
||||||
copy(buffer.Extend(lenEnding), leftover)
|
copy(buffer.Extend(lenEnding), leftover)
|
||||||
|
|
||||||
if _, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes())), false); err != io.ErrUnexpectedEOF {
|
if _, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes()))); err != io.ErrUnexpectedEOF {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -110,7 +110,7 @@ func (h *HeaderReader) Read(reader io.Reader) (*buf.Buffer, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse the request
|
// Parse the request
|
||||||
if req, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes())), false); err != nil {
|
if req, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes()))); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
} else {
|
} else {
|
||||||
h.req = req
|
h.req = req
|
||||||
|
|
|
@ -8,4 +8,4 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
//go:linkname readRequest net/http.readRequest
|
//go:linkname readRequest net/http.readRequest
|
||||||
func readRequest(b *bufio.Reader, deleteHostHeader bool) (req *http.Request, err error)
|
func readRequest(b *bufio.Reader) (req *http.Request, err error)
|
||||||
|
|
Loading…
Reference in a new issue