diff options
Diffstat (limited to 'fix-boost1.66-api.diff')
| -rw-r--r-- | fix-boost1.66-api.diff | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/fix-boost1.66-api.diff b/fix-boost1.66-api.diff deleted file mode 100644 index 0496f251584b..000000000000 --- a/fix-boost1.66-api.diff +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/webserver/proxyclient.cpp b/webserver/proxyclient.cpp -index 6bd6b8771..646cfdeee 100644 ---- a/webserver/proxyclient.cpp -+++ b/webserver/proxyclient.cpp -@@ -770,8 +770,8 @@ namespace http { - void CProxyManager::StartThread() - { - try { -- //boost::asio::ssl::context ctx(io_service, boost::asio::ssl::context::tlsv12_client); -- boost::asio::ssl::context ctx(io_service, boost::asio::ssl::context::sslv23); -+ //boost::asio::ssl::context ctx(boost::asio::ssl::context::tlsv12_client); -+ boost::asio::ssl::context ctx(boost::asio::ssl::context::sslv23); - ctx.set_verify_mode(boost::asio::ssl::verify_none); - - proxyclient.reset(new CProxyClient(io_service, ctx, m_pWebEm)); -diff --git a/webserver/server.cpp b/webserver/server.cpp -index fe001e811..c0eec2166 100644 ---- a/webserver/server.cpp -+++ b/webserver/server.cpp -@@ -152,7 +152,7 @@ void server::handle_accept(const boost::system::error_code& e) { - ssl_server::ssl_server(const ssl_server_settings & ssl_settings, request_handler & user_request_handler) : - server_base(ssl_settings, user_request_handler), - settings_(ssl_settings), -- context_(io_service_, ssl_settings.get_ssl_method()) -+ context_(ssl_settings.get_ssl_method()) - { - #ifdef DEBUG_WWW - _log.Log(LOG_STATUS, "[web:%s] create ssl_server using ssl_server_settings : %s", ssl_settings.listening_port.c_str(), ssl_settings.to_string().c_str()); -@@ -165,7 +165,7 @@ ssl_server::ssl_server(const ssl_server_settings & ssl_settings, request_handler - ssl_server::ssl_server(const server_settings & settings, request_handler & user_request_handler) : - server_base(settings, user_request_handler), - settings_(dynamic_cast<ssl_server_settings const &>(settings)), -- context_(io_service_, dynamic_cast<ssl_server_settings const &>(settings).get_ssl_method()) { -+ context_(dynamic_cast<ssl_server_settings const &>(settings).get_ssl_method()) { - #ifdef DEBUG_WWW - _log.Log(LOG_STATUS, "[web:%s] create ssl_server using server_settings : %s", settings.listening_port.c_str(), settings.to_string().c_str()); - #endif |