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

8
option/simple.go
View File

@ -27,8 +27,8 @@ type SocksOutboundOptions struct {
type HTTPOutboundOptions struct {
DialerOptions
ServerOptions
Username string `json:"username,omitempty"`
Password string `json:"password,omitempty"`
TLS *OutboundTLSOptions `json:"tls,omitempty"`
Headers map[string]Listable[string] `json:"headers,omitempty"`
Username string `json:"username,omitempty"`
Password string `json:"password,omitempty"`
TLS *OutboundTLSOptions `json:"tls,omitempty"`
Headers map[string]Listable[string] `json:"headers,omitempty"`
}

19
outbound/http.go
View File

@ -3,7 +3,7 @@ package outbound
import (
"context"
"net"
H "net/http"
"net/http"
"os"
"github.com/sagernet/sing-box/adapter"
@ -15,14 +15,14 @@ import (
"github.com/sagernet/sing/common"
M "github.com/sagernet/sing/common/metadata"
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)
type HTTP struct {
myOutboundAdapter
client *http.Client
client *sHTTP.Client
}
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 {
return nil, err
}
var headers H.Header
headers = make(H.Header)
for key, valueList := range options.Headers {
headers.Set(key, valueList[0])
for _, value := range valueList[1:]{
headers.Add(key, value)
var headers http.Header
if options.Headers != nil {
headers = make(http.Header)
for key, values := range options.Headers {
headers[key] = values
}
}
return &HTTP{
@ -46,7 +45,7 @@ func NewHTTP(router adapter.Router, logger log.ContextLogger, tag string, option
logger: logger,
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
}