Merge branch 'master' into fix-reload

diff --cc pdns/ueberbackend.cc
index ebb30a63746d0f2631b122f60c2f8b66ef983220,01671204fb11898edfbed7ab76500c52619663ba..2c390a8f8845123b1b97c9c5c90306a576ec11cf
--- 1/pdns/ueberbackend.cc
--- 2/pdns/ueberbackend.cc
+++ b/pdns/ueberbackend.cc
@@@ -321,18 -277,19 +321,20 @@@ bool UeberBackend::getSOA(const string 
      }
    }
      
 +  check_op_requests();
    for(vector<DNSBackend *>::const_iterator i=backends.begin();i!=backends.end();++i)
      if((*i)->getSOA(domain, sd, p)) {
-       DNSResourceRecord rr;
-       rr.qname=domain;
-       rr.qtype=QType::SOA;
-       rr.content=serializeSOAData(sd);
-       rr.ttl=sd.ttl;
-       rr.domain_id=sd.domain_id;
-       vector<DNSResourceRecord> rrs;
-       rrs.push_back(rr);
-       addCache(d_question, rrs);
+       if( d_cache_ttl ) {
+         DNSResourceRecord rr;
+         rr.qname=domain;
+         rr.qtype=QType::SOA;
+         rr.content=serializeSOAData(sd);
+         rr.ttl=sd.ttl;
+         rr.domain_id=sd.domain_id;
+         vector<DNSResourceRecord> rrs;
+         rrs.push_back(rr);
+         addCache(d_question, rrs);
+       }
        return true;
      }
  

diff --cc pdns/ueberbackend.hh
Simple merge