SagerNet/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-04-03 20:07:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Allow http1 in v2ray HTTP transport

Browse source
This commit is contained in:
世界 2022-08-22 22:51:08 +08:00
parent 4005452772
commit a24a2b475a
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
4 changed files with 130 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
transport/v2rayhttp/server.go
View file

@ -12,8 +12,6 @@ import (
C "github.com/sagernet/sing-box/constant"
"github.com/sagernet/sing-box/option"
"github.com/sagernet/sing/common"
"github.com/sagernet/sing/common/buf"
"github.com/sagernet/sing/common/bufio"
E "github.com/sagernet/sing/common/exceptions"
M "github.com/sagernet/sing/common/metadata"
N "github.com/sagernet/sing/common/network"
@ -96,22 +94,12 @@ func (s *Server) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
}
if h, ok := writer.(http.Hijacker); ok {
conn, reader, err := h.Hijack()
conn, _, err := h.Hijack()
if err != nil {
writer.WriteHeader(http.StatusInternalServerError)
s.badRequest(request, E.Cause(err, "hijack conn"))
return
}
if reader.Available() > 0 {
buffer := buf.NewSize(reader.Available())
_, err = buffer.ReadFullFrom(reader, buffer.FreeLen())
if err != nil {
writer.WriteHeader(http.StatusInternalServerError)
s.badRequest(request, E.Cause(err, "read cached data"))
return
}
conn = bufio.NewCachedConn(conn, buffer)
}
s.handler.NewConnection(request.Context(), conn, M.Metadata{})
} else {
conn := &ServerHTTPConn{