mirror of
https://github.com/gospider007/requests.git
synced 2025-12-24 13:57:52 +08:00
sync
This commit is contained in:
6
dial.go
6
dial.go
@@ -396,10 +396,6 @@ func (obj *Dialer) verifySocks5Auth(conn net.Conn, proxyAddr Address) (err error
|
||||
}
|
||||
switch readCon[1] {
|
||||
case 2:
|
||||
if proxyAddr.User == "" || proxyAddr.Password == "" {
|
||||
err = errors.New("socks5 need auth")
|
||||
return
|
||||
}
|
||||
if _, err = conn.Write(append(
|
||||
append(
|
||||
[]byte{1, byte(len(proxyAddr.User))},
|
||||
@@ -410,7 +406,7 @@ func (obj *Dialer) verifySocks5Auth(conn net.Conn, proxyAddr Address) (err error
|
||||
tools.StringToBytes(proxyAddr.Password)...,
|
||||
)...,
|
||||
)); err != nil {
|
||||
return
|
||||
return tools.WrapError(err, "socks5 user or password error")
|
||||
}
|
||||
if _, err = io.ReadFull(conn, readCon); err != nil {
|
||||
return
|
||||
|
||||
@@ -289,7 +289,7 @@ func (obj *Client) request(ctx *Response) (err error) {
|
||||
if reqs.Header, err = ctx.option.initOrderHeaders(); err != nil {
|
||||
return errors.Join(err, errors.New("tempRequest init headers error"), err)
|
||||
}
|
||||
if isWebsocket && reqs.Header.Get("Sec-WebSocket-Key") == "" {
|
||||
if isWebsocket {
|
||||
websocket.SetClientHeadersWithOption(reqs.Header, ctx.option.WsOption)
|
||||
}
|
||||
if href.User != nil && reqs.Header.Get("Authorization") == "" {
|
||||
|
||||
Reference in New Issue
Block a user