jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed 'using namespace' from .hpp-files

Browse source
This commit is contained in:
eidheim 2014-07-14 13:27:06 +02:00
commit 7a7956b700
2 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

14
server_https.hpp
View file

@ -5,31 +5,31 @@
#include <boost/asio/ssl.hpp>
namespace SimpleWeb {
typedef ssl::stream<ip::tcp::socket> HTTPS;
typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> HTTPS;
template<>
class Server<HTTPS> : public ServerBase<HTTPS> {
public:
Server(unsigned short port, size_t num_threads, const string& cert_file, const string& private_key_file) :
ServerBase<HTTPS>::ServerBase(port, num_threads), context(ssl::context::sslv23) {
Server(unsigned short port, size_t num_threads, const std::string& cert_file, const std::string& private_key_file) :
ServerBase<HTTPS>::ServerBase(port, num_threads), context(boost::asio::ssl::context::sslv23) {
context.use_certificate_chain_file(cert_file);
context.use_private_key_file(private_key_file, ssl::context::pem);
context.use_private_key_file(private_key_file, boost::asio::ssl::context::pem);
}
private:
ssl::context context;
boost::asio::ssl::context context;
void accept() {
//Create new socket for this connection
//Shared_ptr is used to pass temporary objects to the asynchronous functions
shared_ptr<HTTPS> socket(new HTTPS(m_io_service, context));
std::shared_ptr<HTTPS> socket(new HTTPS(m_io_service, context));
acceptor.async_accept((*socket).lowest_layer(), [this, socket](const boost::system::error_code& ec) {
//Immediately start accepting a new connection
accept();
if(!ec) {
(*socket).async_handshake(ssl::stream_base::server, [this, socket](const boost::system::error_code& ec) {
(*socket).async_handshake(boost::asio::ssl::stream_base::server, [this, socket](const boost::system::error_code& ec) {
if(!ec) {
process_request_and_respond(socket);
}