Use upstream parsing from master branch (#438)

2 files changed, 9 insertions, 14 deletions

diff --git a/middleware/auto/setup.go b/middleware/auto/setup.go
index bf72f4549..1099cb7f3 100644
--- a/middleware/auto/setup.go
+++ b/middleware/auto/setup.go
@@ -2,7 +2,6 @@ package auto
 
 import (
 	"log"
-	"net"
 	"os"
 	"path"
 	"regexp"
@@ -13,6 +12,7 @@ import (
 	"github.com/miekg/coredns/middleware"
 	"github.com/miekg/coredns/middleware/file"
 	"github.com/miekg/coredns/middleware/metrics"
+	"github.com/miekg/coredns/middleware/pkg/dnsutil"
 	"github.com/miekg/coredns/middleware/proxy"
 
 	"github.com/mholt/caddy"
@@ -149,13 +149,11 @@ func autoParse(c *caddy.Controller) (Auto, error) {
 					if len(args) == 0 {
 						return a, c.ArgErr()
 					}
-					for i := 0; i < len(args); i++ {
-						h, p, e := net.SplitHostPort(args[i])
-						if e != nil && p == "" {
-							args[i] = h + ":53"
-						}
+					ups, err := dnsutil.ParseHostPortOrFile(args...)
+					if err != nil {
+						return a, err
 					}
-					a.loader.proxy = proxy.New(args)
+					a.loader.proxy = proxy.New(ups)
 
 				default:
 					t, _, e := file.TransferParse(c, false)
diff --git a/middleware/file/setup.go b/middleware/file/setup.go
index 6ae6fc8c4..a827ba49a 100644
--- a/middleware/file/setup.go
+++ b/middleware/file/setup.go
@@ -2,7 +2,6 @@ package file
 
 import (
 	"fmt"
-	"net"
 	"os"
 	"path"
 
@@ -107,13 +106,11 @@ func fileParse(c *caddy.Controller) (Zones, error) {
 					if len(args) == 0 {
 						return Zones{}, c.ArgErr()
 					}
-					for i := 0; i < len(args); i++ {
-						h, p, e := net.SplitHostPort(args[i])
-						if e != nil && p == "" {
-							args[i] = h + ":53"
-						}
+					ups, err := dnsutil.ParseHostPortOrFile(args...)
+					if err != nil {
+						return Zones{}, err
 					}
-					prxy = proxy.New(args)
+					prxy = proxy.New(ups)
 				}
 
 				for _, origin := range origins {