]> granicus.if.org Git - pdns/commitdiff
Merge pull request #4623 from rgacogne/rec-tcp-rfc7766-section10
authorRemi Gacogne <rgacogne@users.noreply.github.com>
Tue, 20 Dec 2016 08:50:32 +0000 (09:50 +0100)
committerGitHub <noreply@github.com>
Tue, 20 Dec 2016 08:50:32 +0000 (09:50 +0100)
rec: Add TCP management options described in section 10 of rfc7766

1  2 
docs/markdown/recursor/settings.md
pdns/pdns_recursor.cc
pdns/syncres.hh

Simple merge
index 9608e298ba83d004cbc4b131b5ef81938a85536d,bfdeac602fd39c39cf647656700fb0cbfe7dc534..bd79bb4a27a95211c0c4310818260a689a2dd453
@@@ -91,8 -91,9 +91,9 @@@ extern SortList g_sortlist
  #endif
  
  __thread FDMultiplexer* t_fdm;
 -__thread unsigned int t_id;
 +static __thread unsigned int t_id;
  unsigned int g_maxTCPPerClient;
+ size_t g_tcpMaxQueriesPerConn;
  unsigned int g_networkTimeoutMsec;
  uint64_t g_latencyStatSize;
  bool g_logCommonErrors;
diff --cc pdns/syncres.hh
Simple merge