From ff5bba1ba4940a35f9bb964272476a8e19d6d533 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Thu, 25 Jan 2018 15:55:27 +0100
Subject: [PATCH] up

---
 Gopkg.lock                                   |  6 +++---
 README.md                                    |  4 +++-
 dnscrypt-proxy/main.go                       |  2 +-
 vendor/github.com/miekg/dns/Makefile.release |  1 +
 vendor/github.com/miekg/dns/README.md        |  2 ++
 vendor/github.com/miekg/dns/server.go        | 21 +++++++++++---------
 vendor/github.com/miekg/dns/version.go       |  2 +-
 7 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 0ae58f57..405f1a25 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -100,8 +100,8 @@
 [[projects]]
   name = "github.com/miekg/dns"
   packages = ["."]
-  revision = "5ec25f2a5044291b6c8abf43ed8a201da241e69e"
-  version = "v1.0.3"
+  revision = "5364553f1ee9cddc7ac8b62dce148309c386695b"
+  version = "v1.0.4"
 
 [[projects]]
   branch = "master"
@@ -139,7 +139,7 @@
     "windows/svc/eventlog",
     "windows/svc/mgr"
   ]
-  revision = "af50095a40f9041b3b38960738837185c26e9419"
+  revision = "ef802241c90f84d84d644a2d8d0de8ee96038c9c"
 
 [solve-meta]
   analyzer-name = "dep"
diff --git a/README.md b/README.md
index 759fb5e1..16e43b4b 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 A flexible DNS proxy, with support for encrypted DNS protocols such as [DNSCrypt](https://github.com/DNSCrypt/dnscrypt-protocol/blob/master/DNSCRYPT-V2-PROTOCOL.txt).
 
-## [dnscrypt-proxy 2.0.0beta9 is available for download!](https://github.com/jedisct1/dnscrypt-proxy/releases/latest)
+## [dnscrypt-proxy 2.0.0beta10 is available for download!](https://github.com/jedisct1/dnscrypt-proxy/releases/latest)
 
 ## Installation
 
@@ -26,6 +26,8 @@ dnscrypt-proxy is a flexible DNS proxy. It runs on your computer or router, and
 
 With administrator privileges, type `dnscrypt-proxy -service install` to register dnscrypt-proxy as a system service, and `dnscrypt-proxy -service start` to start it.
 
+On Windows, this is not even required: you can just double-click on `server-install.bat` to install the service.
+
 Done. It will automatically start at boot.
 
 This setup procedure is compatible with Windows, Linux (systemd, Upstart, SysV), and macOS (launchd).
diff --git a/dnscrypt-proxy/main.go b/dnscrypt-proxy/main.go
index 60fee210..77c2bc66 100644
--- a/dnscrypt-proxy/main.go
+++ b/dnscrypt-proxy/main.go
@@ -16,7 +16,7 @@ import (
 	"golang.org/x/crypto/curve25519"
 )
 
-const AppVersion = "2.0.0beta9"
+const AppVersion = "2.0.0beta10"
 
 type Proxy struct {
 	proxyPublicKey               [32]byte
diff --git a/vendor/github.com/miekg/dns/Makefile.release b/vendor/github.com/miekg/dns/Makefile.release
index 4069eb08..8fb748e8 100644
--- a/vendor/github.com/miekg/dns/Makefile.release
+++ b/vendor/github.com/miekg/dns/Makefile.release
@@ -49,3 +49,4 @@ commit:
 push:
 	@echo Pushing release $(VERSION) to master
 	git push --tags
+	git push
diff --git a/vendor/github.com/miekg/dns/README.md b/vendor/github.com/miekg/dns/README.md
index e6dbad25..1ad23c75 100644
--- a/vendor/github.com/miekg/dns/README.md
+++ b/vendor/github.com/miekg/dns/README.md
@@ -62,6 +62,8 @@ A not-so-up-to-date-list-that-may-be-actually-current:
 * https://dnssectest.net/
 * https://dns.apebits.com
 * https://github.com/oif/apex
+* https://github.com/jedisct1/dnscrypt-proxy
+* https://github.com/jedisct1/rpdns
 
 Send pull request if you want to be listed here.
 
diff --git a/vendor/github.com/miekg/dns/server.go b/vendor/github.com/miekg/dns/server.go
index b79abad5..685753f4 100644
--- a/vendor/github.com/miekg/dns/server.go
+++ b/vendor/github.com/miekg/dns/server.go
@@ -460,13 +460,6 @@ func (srv *Server) serveTCP(l net.Listener) error {
 	// deadline is not used here
 	for {
 		rw, err := l.Accept()
-		if err != nil {
-			if neterr, ok := err.(net.Error); ok && neterr.Temporary() {
-				continue
-			}
-			return err
-		}
-		m, err := reader.ReadTCP(rw, rtimeout)
 		srv.lock.RLock()
 		if !srv.started {
 			srv.lock.RUnlock()
@@ -474,9 +467,19 @@ func (srv *Server) serveTCP(l net.Listener) error {
 		}
 		srv.lock.RUnlock()
 		if err != nil {
-			continue
+			if neterr, ok := err.(net.Error); ok && neterr.Temporary() {
+				continue
+			}
+			return err
 		}
-		go srv.serve(rw.RemoteAddr(), handler, m, nil, nil, rw)
+		go func() {
+			m, err := reader.ReadTCP(rw, rtimeout)
+			if err != nil {
+				rw.Close()
+				return
+			}
+			srv.serve(rw.RemoteAddr(), handler, m, nil, nil, rw)
+		}()
 	}
 }
 
diff --git a/vendor/github.com/miekg/dns/version.go b/vendor/github.com/miekg/dns/version.go
index 0e23cc3e..e41d2b3c 100644
--- a/vendor/github.com/miekg/dns/version.go
+++ b/vendor/github.com/miekg/dns/version.go
@@ -3,7 +3,7 @@ package dns
 import "fmt"
 
 // Version is current version of this library.
-var Version = V{1, 0, 3}
+var Version = V{1, 0, 4}
 
 // V holds the version of this library.
 type V struct {