reverting usage of proxy for http requests

[btrtrc.git] / client.go

diff --git a/client.go b/client.go
index 2dba6973c516cdbbcd5a131c5b895c2dd506fc9f..14fff4f64da6fd8b66895f1cb7f0967b936951a0 100644 (file)
--- a/client.go
+++ b/client.go
@@ -10,6 +10,8 @@ import (
        "fmt"
        "io"
        "net"
+       "net/http"
+       "net/url"
        "strconv"
        "strings"
        "time"
@@ -220,6 +222,12 @@ func NewClient(cfg *ClientConfig) (cl *Client, err error) {
                }
        }
 
+       if cl.config.HTTPProxy == nil && cl.config.ProxyURL != "" {
+               if fixedURL, err := url.Parse(cl.config.ProxyURL); err == nil {
+                       cl.config.HTTPProxy = http.ProxyURL(fixedURL)
+               }
+       }
+
        cl.conns, err = listenAll(cl.enabledPeerNetworks(), cl.config.ListenHost, cl.config.ListenPort, cl.config.ProxyURL, cl.firewallCallback)
        if err != nil {
                return