chunyu/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-06-13 21:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
世界 2023-04-11 17:48:57 +08:00
parent 6dc8ca3df4
commit 89bd9b9ee5
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
outbound/http.go
View File

@ -3,7 +3,7 @@ package outbound
import ( import (
"context" "context"
"net" "net"
H "net/http" "net/http"
"os" "os"
"github.com/sagernet/sing-box/adapter" "github.com/sagernet/sing-box/adapter"
@ -15,14 +15,14 @@ import (
"github.com/sagernet/sing/common" "github.com/sagernet/sing/common"
M "github.com/sagernet/sing/common/metadata" M "github.com/sagernet/sing/common/metadata"
N "github.com/sagernet/sing/common/network" N "github.com/sagernet/sing/common/network"
"github.com/sagernet/sing/protocol/http" sHTTP "github.com/sagernet/sing/protocol/http"
) )
var _ adapter.Outbound = (*HTTP)(nil) var _ adapter.Outbound = (*HTTP)(nil)
type HTTP struct { type HTTP struct {
myOutboundAdapter myOutboundAdapter
client *http.Client client *sHTTP.Client
} }
func NewHTTP(router adapter.Router, logger log.ContextLogger, tag string, options option.HTTPOutboundOptions) (*HTTP, error) { func NewHTTP(router adapter.Router, logger log.ContextLogger, tag string, options option.HTTPOutboundOptions) (*HTTP, error) {
@ -30,12 +30,11 @@ func NewHTTP(router adapter.Router, logger log.ContextLogger, tag string, option
if err != nil { if err != nil {
return nil, err return nil, err
} }
var headers H.Header var headers http.Header
headers = make(H.Header) if options.Headers != nil {
for key, valueList := range options.Headers { headers = make(http.Header)
headers.Set(key, valueList[0]) for key, values := range options.Headers {
for _, value := range valueList[1:]{ headers[key] = values
headers.Add(key, value)
} }
} }
return &HTTP{ return &HTTP{
@ -46,7 +45,7 @@ func NewHTTP(router adapter.Router, logger log.ContextLogger, tag string, option
logger: logger, logger: logger,
tag: tag, tag: tag,
}, },
http.NewClient(detour, options.ServerOptions.Build(), options.Username, options.Password, headers), sHTTP.NewClient(detour, options.ServerOptions.Build(), options.Username, options.Password, headers),
}, nil }, nil
} }