Removed assignment operator from webserver class and made constants its

Sebastiano Merlino · Sebastiano Merlino · commit c854404ba5f1 · 2013-01-27T21:30:26.000+01:00
unchangeable attributes
diff --git a/src/httpserver/webserver.hpp b/src/httpserver/webserver.hpp
@@ -331,7 +331,6 @@ class webserver
             render_ptr internal_error_resource = 0x0
         );
         webserver(const create_webserver& params);
-        webserver& operator=(const webserver& b);
         /**
          * Destructor of the class
         **/
@@ -471,38 +470,38 @@ class webserver
         **/
         void sweet_kill();
     private:
-        int port;
-        http_utils::start_method_T start_method;
-        int max_threads;
-        int max_connections;
-        int memory_limit;
-        int connection_timeout;
-        int per_IP_connection_limit;
+        const int port;
+        const http_utils::start_method_T start_method;
+        const int max_threads;
+        const int max_connections;
+        const int memory_limit;
+        const int connection_timeout;
+        const int per_IP_connection_limit;
         log_access_ptr log_access;
         log_error_ptr log_error;
         validator_ptr validator;
         unescaper_ptr unescaper;
         const struct sockaddr* bind_address;
         int bind_socket;
-        int max_thread_stack_size;
-        bool use_ssl;
-        bool use_ipv6;
-        bool debug;
-        bool pedantic;
-        std::string https_mem_key;
-        std::string https_mem_cert;
-        std::string https_mem_trust;
-        std::string https_priorities;
-        http_utils::cred_type_T cred_type;
-        std::string digest_auth_random;
-        int nonce_nc_size;
+        const int max_thread_stack_size;
+        const bool use_ssl;
+        const bool use_ipv6;
+        const bool debug;
+        const bool pedantic;
+        const std::string https_mem_key;
+        const std::string https_mem_cert;
+        const std::string https_mem_trust;
+        const std::string https_priorities;
+        const http_utils::cred_type_T cred_type;
+        const std::string digest_auth_random;
+        const int nonce_nc_size;
         bool running;
-        http_utils::policy_T default_policy;
-        bool basic_auth_enabled;
-        bool digest_auth_enabled;
-        bool regex_checking;
-        bool ban_system_enabled;
-        bool post_process_enabled;
+        const http_utils::policy_T default_policy;
+        const bool basic_auth_enabled;
+        const bool digest_auth_enabled;
+        const bool regex_checking;
+        const bool ban_system_enabled;
+        const bool post_process_enabled;
         bool single_resource;
         pthread_mutex_t mutexwait;
         pthread_rwlock_t runguard;
@@ -539,6 +538,8 @@ class webserver
 
         std::map<std::string, details::event_tuple> event_suppliers;
 
+        webserver& operator=(const webserver& b);
+
         void init(render_ptr single_resource);
         static void* select(void* self);
         void schedule_fd(int fd, fd_set* schedule_list, int* max);
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -502,48 +502,6 @@ webserver::webserver(const create_webserver& params):
     init(params._single_resource);
 }
 
-webserver& webserver::operator=(const webserver& b)
-{
-    port = b.port;
-    start_method = b.start_method;
-    max_threads = b.max_threads;
-    max_connections = b.max_connections;
-    memory_limit = b.memory_limit;
-    connection_timeout = b.connection_timeout;
-    per_IP_connection_limit = b.per_IP_connection_limit;
-    log_access = b.log_access;
-    log_error = b.log_error;
-    validator = b.validator;
-    unescaper = b.unescaper;
-    bind_address = b.bind_address;
-    bind_socket = b.bind_socket;
-    max_thread_stack_size = b.max_thread_stack_size;
-    use_ssl = b.use_ssl;
-    use_ipv6 = b.use_ipv6;
-    debug = b.debug;
-    pedantic = b.pedantic;
-    https_mem_key = b.https_mem_key;
-    https_mem_cert = b.https_mem_cert;
-    https_mem_trust = b.https_mem_trust;
-    https_priorities = b.https_priorities;
-    cred_type = b.cred_type;
-    digest_auth_random = b.digest_auth_random;
-    nonce_nc_size = b.nonce_nc_size;
-    running = b.running;
-    default_policy = b.default_policy;
-    basic_auth_enabled = b.basic_auth_enabled;
-    digest_auth_enabled = b.digest_auth_enabled;
-    regex_checking = b.regex_checking;
-    ban_system_enabled = b.ban_system_enabled;
-    post_process_enabled = b.post_process_enabled;
-    not_found_resource = b.not_found_resource;
-    method_not_allowed_resource = b.method_not_allowed_resource;
-    method_not_acceptable_resource = b.method_not_acceptable_resource;
-    internal_error_resource = b.internal_error_resource;
-    next_to_choose = b.next_to_choose;
-    return *this;
-}
-
 void webserver::init(render_ptr single_resource)
 {
     if(single_resource != 0x0)
