Merge pull request #1 from Iliad/master

Fix proxy error

Author: xakep666

go.mod

@@ -3,19 +3,19 @@ module github.com/xakep666/wurl
 require (
 	github.com/BurntSushi/toml v0.3.0
 	github.com/blang/semver v0.0.0-20170727064818-2ee87856327b
-	github.com/golang/protobuf v1.1.0
+	github.com/golang/protobuf v1.1.0 // indirect
 	github.com/gorilla/websocket v1.2.0
-	github.com/onsi/ginkgo v1.5.0
-	github.com/onsi/gomega v1.4.0
+	github.com/onsi/ginkgo v1.5.0 // indirect
+	github.com/onsi/gomega v1.4.0 // indirect
 	github.com/sirupsen/logrus v1.0.5
-	github.com/stretchr/testify v1.2.1
-	golang.org/x/crypto v0.0.0-20180403160946-b2aa35443fbc
+	github.com/stretchr/testify v1.2.1 // indirect
+	golang.org/x/crypto v0.0.0-20180403160946-b2aa35443fbc // indirect
 	golang.org/x/net v0.0.0-20180502164142-640f4622ab69
-	golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f
-	golang.org/x/sys v0.0.0-20180406135729-3b87a42e500a
-	golang.org/x/text v0.3.0
-	gopkg.in/airbrake/gobrake.v2 v2.0.9
-	gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2
+	golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f // indirect
+	golang.org/x/sys v0.0.0-20180406135729-3b87a42e500a // indirect
+	golang.org/x/text v0.3.0 // indirect
+	gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
+	gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
 	gopkg.in/urfave/cli.v2 v2.0.0-20180128182452-d3ae77c26ac8
-	gopkg.in/yaml.v2 v2.2.1
+	gopkg.in/yaml.v2 v2.2.1 // indirect
 )

main.go

@@ -15,7 +15,7 @@ import (
 	"gopkg.in/urfave/cli.v2/altsrc"
 )
 
-var Version = "0.0.1-alpha"
+var Version = "0.0.2-alpha"
 
 func main() {
 	app := &cli.App{

pkg/util/options.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"net"
 	"net/http"
 	"net/textproto"
 	"net/url"
@@ -98,15 +99,20 @@ func processFromFlag(inOpt string) (io.ReadCloser, error) {
 }
 
 func processProxyFlag(urlOpt string) (dialFunc config.DialFunc, err error) {
-	proxyURL, err := url.Parse(urlOpt)
-	if err != nil {
-		return nil, err
+	if urlOpt != "" {
+		var dialer proxy.Dialer
+		proxyURL, err := url.Parse(urlOpt)
+		if err != nil {
+			return nil, err
+		}
+		dialer, err = proxy.FromURL(proxyURL, proxy.Direct)
+		if err != nil {
+			return nil, err
+		}
+		dialFunc = dialer.Dial
+	} else {
+		dialFunc = net.Dial
 	}
-
-	var dialer proxy.Dialer
-	dialer, err = proxy.FromURL(proxyURL, proxy.Direct)
-	dialFunc = dialer.Dial
-
 	return
 }