From d49a7b462dc7e134cb346eaa3fbacc125b0746e1 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Wed, 3 Oct 2018 16:24:41 +0200
Subject: [PATCH] Keep the original OPT record before setting the payload size

Maybe
fixes #592
---
 dnscrypt-proxy/plugin_get_set_payload_size.go | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/dnscrypt-proxy/plugin_get_set_payload_size.go b/dnscrypt-proxy/plugin_get_set_payload_size.go
index d866120f..7f551e59 100644
--- a/dnscrypt-proxy/plugin_get_set_payload_size.go
+++ b/dnscrypt-proxy/plugin_get_set_payload_size.go
@@ -35,13 +35,6 @@ func (plugin *PluginGetSetPayloadSize) Eval(pluginsState *PluginsState, msg *dns
 	pluginsState.dnssec = dnssec
 	pluginsState.maxPayloadSize = Min(MaxDNSUDPPacketSize-ResponseOverhead, Max(pluginsState.originalMaxPayloadSize, pluginsState.maxPayloadSize))
 	if pluginsState.maxPayloadSize > 512 {
-		extra2 := []dns.RR{}
-		for _, extra := range msg.Extra {
-			if extra.Header().Rrtype != dns.TypeOPT {
-				extra2 = append(extra2, extra)
-			}
-		}
-		msg.Extra = extra2
 		msg.SetEdns0(uint16(pluginsState.maxPayloadSize), dnssec)
 	}
 	return nil