Merge pull request #4988 from rgacogne/rec-incoming-ecs

rec: Add `use-incoming-edns-subnet` to process and pass along ECS

diff --cc docs/markdown/recursor/settings.md
Simple merge

diff --cc pdns/lua-recursor4.cc
index dfe1ba1f44ee3adc811bf0838cc9613dd12103b7,7316173e4c21b871634706be9bfe5a329b3d88da..0749e30b7a8ea9ac4e807204593d5b8247788d60
--- 1/pdns/lua-recursor4.cc
--- 2/pdns/lua-recursor4.cc
+++ b/pdns/lua-recursor4.cc
@@@ -25,10 -25,10 +25,11 @@@
  #include "dnsparser.hh"
  #include "syncres.hh"
  #include "namespaces.hh"
- #include "rec_channel.hh" 
+ #include "rec_channel.hh"
+ #include "ednsoptions.hh"
  #include "ednssubnet.hh"
  #include "filterpo.hh"
 +#include "rec-snmp.hh"
  #include <unordered_set>
  
  #if !defined(HAVE_LUA)

diff --cc pdns/pdns_recursor.cc
Simple merge