Skip to content

Commit

Permalink
Merge pull request #3 from NanamiNakano/master
Browse files Browse the repository at this point in the history
Merge code from upstream
  • Loading branch information
Daiyangcheng authored Aug 23, 2023
2 parents 8f36575 + 1f21e31 commit 9f24496
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pkg/util/tcpmux/httpconnect.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func (muxer *HTTPConnectTCPMuxer) auth(c net.Conn, username, password string, re
}

func (muxer *HTTPConnectTCPMuxer) getHostFromHTTPConnect(c net.Conn) (net.Conn, map[string]string, error) {
reqInfoMap := make(map[string]string, 0)
reqInfoMap := make(map[string]string)
sc, rd := libnet.NewSharedConn(c)

host, httpUser, httpPwd, err := muxer.readHTTPConnectRequest(rd)
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/vhost/https.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func NewHTTPSMuxer(listener net.Listener, timeout time.Duration) (*HTTPSMuxer, e
}

func GetHTTPSHostname(c net.Conn) (_ net.Conn, _ map[string]string, err error) {
reqInfoMap := make(map[string]string, 0)
reqInfoMap := make(map[string]string)
sc, rd := libnet.NewSharedConn(c)

clientHello, err := readClientHello(rd)
Expand Down

0 comments on commit 9f24496

Please sign in to comment.