]>
Commit | Line | Data |
---|---|---|
311afc3c JB |
1 | --- pdns-4.3.0/pdns/webserver.cc.orig 2020-02-25 07:57:13.000000000 +0100 |
2 | +++ pdns-4.3.0/pdns/webserver.cc 2020-07-31 22:22:55.140035772 +0200 | |
3 | @@ -107,7 +107,7 @@ | |
4 | ||
5 | void WebServer::registerBareHandler(const string& url, HandlerFunction handler) | |
6 | { | |
7 | - YaHTTP::THandlerFunction f = boost::bind(&bareHandlerWrapper, handler, _1, _2); | |
8 | + YaHTTP::THandlerFunction f = boost::bind(&bareHandlerWrapper, handler, boost::placeholders::_1, boost::placeholders::_2); | |
9 | YaHTTP::Router::Any(url, f); | |
10 | } | |
11 | ||
12 | @@ -179,7 +179,7 @@ | |
13 | } | |
14 | ||
15 | void WebServer::registerApiHandler(const string& url, HandlerFunction handler, bool allowPassword) { | |
16 | - HandlerFunction f = boost::bind(&WebServer::apiWrapper, this, handler, _1, _2, allowPassword); | |
17 | + HandlerFunction f = boost::bind(&WebServer::apiWrapper, this, handler, boost::placeholders::_1, boost::placeholders::_2, allowPassword); | |
18 | registerBareHandler(url, f); | |
19 | } | |
20 | ||
21 | @@ -196,7 +196,7 @@ | |
22 | } | |
23 | ||
24 | void WebServer::registerWebHandler(const string& url, HandlerFunction handler) { | |
25 | - HandlerFunction f = boost::bind(&WebServer::webWrapper, this, handler, _1, _2); | |
26 | + HandlerFunction f = boost::bind(&WebServer::webWrapper, this, handler, boost::placeholders::_1, boost::placeholders::_2); | |
27 | registerBareHandler(url, f); | |
28 | } | |
29 | ||
30 | --- pdns-4.3.0/pdns/ws-auth.cc.orig 2020-03-21 03:38:01.000000000 +0100 | |
31 | +++ pdns-4.3.0/pdns/ws-auth.cc 2020-07-31 22:32:10.629153686 +0200 | |
32 | @@ -2328,8 +2328,8 @@ | |
33 | d_ws->registerApiHandler("/api", &apiDiscovery); | |
34 | } | |
35 | if (::arg().mustDo("webserver")) { | |
36 | - d_ws->registerWebHandler("/style.css", boost::bind(&AuthWebServer::cssfunction, this, _1, _2)); | |
37 | - d_ws->registerWebHandler("/", boost::bind(&AuthWebServer::indexfunction, this, _1, _2)); | |
38 | + d_ws->registerWebHandler("/style.css", boost::bind(&AuthWebServer::cssfunction, this, boost::placeholders::_1, boost::placeholders::_2)); | |
39 | + d_ws->registerWebHandler("/", boost::bind(&AuthWebServer::indexfunction, this, boost::placeholders::_1, boost::placeholders::_2)); | |
40 | } | |
41 | d_ws->go(); | |
42 | } |