fix EDNS1480.

git-svn-id: file:///svn/unbound/trunk@2496 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index c390f5ab539ea20492d7ae0707f02076777b7dc1..022bbe9dc448d1e325e9c95c0b66b6bf3e272a42 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
        - fix bug #408: accept patch from Steve Snyder that comments out
          unused functions in lookup3.c.
        - iana portlist updated.
+       - fix EDNS1480 change memleak and TCP fallback.
 
 15 September 2011: Wouter
        - release 1.4.13.

diff --git a/services/outside_network.c b/services/outside_network.c
index 5896b105aa5daa6411f16f8f90da4eab04dadced..340c8795cb333ddf9aa3e7e5eb0a267108b2f785 100644 (file)
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1694,6 +1694,7 @@ serviced_udp_callback(struct comm_point* c, void* arg, int error,
                /* fallback to TCP */
                /* this discards partial UDP contents */
                if(sq->status == serviced_query_UDP_EDNS ||
+                       sq->status == serviced_query_UDP_EDNS_FRAG ||
                        sq->status == serviced_query_UDP_EDNS_fallback)
                        /* if we have unfinished EDNS_fallback, start again */
                        sq->status = serviced_query_TCP_EDNS;