From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Fri, 28 Sep 2018 10:11:48 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into thread-names
X-Git-Tag: dnsdist-1.3.3~68^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47d0889de7a5e1695af6ac0c82a27a0d82da9318;p=thirdparty%2Fpdns.git

Merge remote-tracking branch 'origin/master' into thread-names
---

47d0889de7a5e1695af6ac0c82a27a0d82da9318
diff --cc pdns/ixfrdist.cc
index f3a04646ae,8645e09114..4a69ade8fb
--- a/pdns/ixfrdist.cc
+++ b/pdns/ixfrdist.cc
@@@ -234,8 -233,7 +234,8 @@@ static void updateCurrentZoneInfo(cons
    g_soas[domain] = newInfo;
  }
  
- void updateThread(const string& workdir, const uint16_t& keep, const uint16_t& axfrTimeout) {
+ void updateThread(const string& workdir, const uint16_t& keep, const uint16_t& axfrTimeout, const uint16_t& soaRetry) {
 +  setThreadName("ixfrdist/update");
    std::map<DNSName, time_t> lastCheck;
  
    // Initialize the serials we have