]> granicus.if.org Git - pdns/commitdiff
Merge pull request #7550 from Habbie/auth-web-bodysize
authorPeter van Dijk <peter.van.dijk@powerdns.com>
Tue, 25 Jun 2019 10:34:08 +0000 (12:34 +0200)
committerGitHub <noreply@github.com>
Tue, 25 Jun 2019 10:34:08 +0000 (12:34 +0200)
auth web: make max request/response body size configurable

1  2 
docs/settings.rst
pdns/common_startup.cc
pdns/webserver.cc
pdns/webserver.hh
pdns/ws-auth.cc

Simple merge
Simple merge
Simple merge
index d7848847f3aab4dc75ab8a4c8f3d2af247b0bd14,f2c7f7496df3bb1952fa0fd4fc8dac3f820097f7..707b0e23c462e889efea6ae3f632ce1a1fbb5506
@@@ -227,10 -237,13 +231,12 @@@ protected
    std::shared_ptr<Server> d_server;
  
    std::string d_apikey;
 -  bool d_registerApiHandlerCalled{false};
 -
 +  void apiWrapper(WebServer::HandlerFunction handler, HttpRequest* req, HttpResponse* resp, bool allowPassword);
    std::string d_webserverPassword;
 -  bool d_registerWebHandlerCalled{false};
 +  void webWrapper(WebServer::HandlerFunction handler, HttpRequest* req, HttpResponse* resp);
  
+   ssize_t d_maxbodysize; // in bytes
    NetmaskGroup d_acl;
  
    const string d_logprefix = "[webserver] ";
diff --cc pdns/ws-auth.cc
Simple merge