Use smart pointer to create a server or ssl server

Author: gaudryc

webserver/cWebem.cpp

@@ -59,10 +59,7 @@ cWebem::cWebem(
 }
 
 cWebem::~cWebem() {
-	// Delete server
-	if (myServer) {
-		delete myServer;
-	}
+	// Delete server (no need with smart pointer)
 }
 
 /**

webserver/cWebem.h

@@ -226,7 +226,7 @@ namespace http {
 			/// store map between pages and application functions
 			std::map < std::string, webem_page_function > myPages_w;
 			/// boost::asio web server (RK: plain or secure)
-			server_base* myServer;
+			boost::shared_ptr<server_base> myServer;
 			// actual theme selected
 			std::string m_actTheme;
 			// root of url for reverse proxy servers

webserver/server.cpp

@@ -211,18 +211,18 @@ std::string ssl_server::get_passphrase() const {
 }
 #endif
 
-server_base * server_factory::create(const server_settings & settings, request_handler & user_request_handler) {
+boost::shared_ptr<server_base> server_factory::create(const server_settings & settings, request_handler & user_request_handler) {
 #ifdef WWW_ENABLE_SSL
 		if (settings.is_secure()) {
 			return create(dynamic_cast<ssl_server_settings const &>(settings), user_request_handler);
 		}
 #endif
-		return new server(settings, user_request_handler);
+		return boost::shared_ptr<server_base>(new server(settings, user_request_handler));
 	}
 
 #ifdef WWW_ENABLE_SSL
-server_base * server_factory::create(const ssl_server_settings & ssl_settings, request_handler & user_request_handler) {
-		return new ssl_server(ssl_settings, user_request_handler);
+boost::shared_ptr<server_base> server_factory::create(const ssl_server_settings & ssl_settings, request_handler & user_request_handler) {
+		return boost::shared_ptr<server_base>(new ssl_server(ssl_settings, user_request_handler));
 	}
 #endif
 

webserver/server.hpp

@@ -119,10 +119,10 @@ class ssl_server : public server_base {
 /// server factory
 class server_factory {
 public:
-	static server_base * create(const server_settings & settings, request_handler & user_request_handler);
+	static boost::shared_ptr<server_base> create(const server_settings & settings, request_handler & user_request_handler);
 
 #ifdef WWW_ENABLE_SSL
-	static server_base * create(const ssl_server_settings & ssl_settings, request_handler & user_request_handler);
+	static boost::shared_ptr<server_base> create(const ssl_server_settings & ssl_settings, request_handler & user_request_handler);
 #endif
 };