Merge remote-tracking branch 'origin/master' into ixfrdist-timeout

diff --cc pdns/ixfrdist.cc
index a581392c29dcedd7da121a70ae4d245e1dd82c21,7f5ce2d833528104ae917ce389f4a5d6bb55a42e..619471cbd23d0a09ffb2c352cc7fe5867f4e034d
--- 1/pdns/ixfrdist.cc
--- 2/pdns/ixfrdist.cc
+++ b/pdns/ixfrdist.cc
@@@ -267,7 -272,12 +279,11 @@@ void updateThread() 
          if (g_verbose) {
            cerr<<"[INFO] Wrote zonedata for "<<domain<<" with serial "<<soa->d_st.serial<<" to "<<dir<<endl;
          }
 -
 -      } catch (ResolverException &e) {
+         {
+           std::lock_guard<std::mutex> guard(g_soas_mutex);
+           g_soas[domain] = soa;
+         }
 +      } catch (PDNSException &e) {
          cerr<<"[WARNING] Could not retrieve AXFR for '"<<domain<<"': "<<e.reason<<endl;
        } catch (runtime_error &e) {
          cerr<<"[WARNING] Could not save zone '"<<domain<<"' to disk: "<<e.what()<<endl;