diff options
| author |  Miek Gieben <miek@miek.nl>
| 2016-11-23 20:44:04 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2016-11-23 20:44:04 +0100 |
| commit | 08e2e9aa46163dc4626797f80b81608dc197b17f (patch) | |
| tree | 697af3e15ccf685ca91f9af3b9e16ac704a1097f | |
| parent | 25c57ea3149f90bd10810af50b3faa7fedd78d58 (diff) | |
| parent | 1cf5e56d5a448d71c8585b04bba148fc6a93768a (diff) | |
| download | coredns-08e2e9aa46163dc4626797f80b81608dc197b17f.tar.gz coredns-08e2e9aa46163dc4626797f80b81608dc197b17f.tar.zst coredns-08e2e9aa46163dc4626797f80b81608dc197b17f.zip | |
Merge pull request #434 from devnev/propagate-truncate-errors
Propagate both message and error in proxy exchange.
| -rw-r--r-- | middleware/proxy/client.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/middleware/proxy/client.go b/middleware/proxy/client.go index 0a35c93e4..b02e8864b 100644 --- a/middleware/proxy/client.go +++ b/middleware/proxy/client.go @@ -65,13 +65,9 @@ func (c *client) Exchange(m *dns.Msg, co net.Conn) (*dns.Msg, time.Duration, err return ret, e }) - rtt := time.Since(start) - if err != nil { - return &dns.Msg{}, rtt, err - } - r1 := r.(dns.Msg) - return &r1, rtt, nil + rtt := time.Since(start) + return &r1, rtt, err } // exchange does *not* return a pointer to dns.Msg because that leads to buffer reuse when |