summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss@sss.chaoslab.ru>2011-10-17 16:33:37 +0300
committerGluzskiy Alexandr <sss@sss.chaoslab.ru>2011-10-17 16:33:37 +0300
commit90dd9988e6e4f7003bfd28994b5abf1cf5364be6 (patch)
treed8a75c21dcc4e9946cd08bcb17d0eb166d49a5d0
parentfceb029308381602d1f73f4a76b436ff436b935a (diff)
modified: server/proxy_ui_server.workspace
modified: server/server/main.cpp
-rw-r--r--server/proxy_ui_server.workspace3
-rw-r--r--server/server/main.cpp4
2 files changed, 5 insertions, 2 deletions
diff --git a/server/proxy_ui_server.workspace b/server/proxy_ui_server.workspace
index 964a5cc..6c4621d 100644
--- a/server/proxy_ui_server.workspace
+++ b/server/proxy_ui_server.workspace
@@ -9,4 +9,7 @@
<Project Name="server" ConfigName="Release"/>
</WorkspaceConfiguration>
</BuildMatrix>
+ <Environment>
+ <![CDATA[]]>
+ </Environment>
</CodeLite_Workspace>
diff --git a/server/server/main.cpp b/server/server/main.cpp
index 62f7108..c4e3640 100644
--- a/server/server/main.cpp
+++ b/server/server/main.cpp
@@ -350,13 +350,13 @@ server::server(boost::asio::io_service& io_service, unsigned short port) : io_se
// context_.set_password_callback(boost::bind(&server::get_password, this));
context_.set_verify_mode(boost::asio::ssl::context::verify_peer | boost::asio::ssl::context::verify_fail_if_no_peer_cert);
tmp_path = b_path;
- tmp_path.append("/ca.crt");
+ tmp_path.append("./ca.crt");
context_.load_verify_file(tmp_path, err);
logger->lock();
*logger << time_str()<<": Openning verify cert: " << tmp_path << " " << err.message()<<"\n";
logger->unlock();
tmp_path = b_path;
- tmp_path.append("/server.crt");
+ tmp_path.append("./server.crt");
context_.use_certificate_file(tmp_path, boost::asio::ssl::context::pem, err);
logger->lock();
*logger << time_str()<<": Openning server cert file: " << tmp_path << " " << err.message()<<"\n";