comet_enabled renamed into deferred_enabled

etr · etr · commit 40e5f6d59676 · 2019-01-12T02:35:27.000Z
diff --git a/src/httpserver/create_webserver.hpp b/src/httpserver/create_webserver.hpp
@@ -79,7 +79,7 @@ class create_webserver
             _regex_checking(true),
             _ban_system_enabled(true),
             _post_process_enabled(true),
-            _comet_enabled(false),
+            _deferred_enabled(false),
             _single_resource(false),
             _not_found_resource(0x0),
             _method_not_allowed_resource(0x0),
@@ -120,7 +120,7 @@ class create_webserver
             _regex_checking(true),
             _ban_system_enabled(true),
             _post_process_enabled(true),
-            _comet_enabled(false),
+            _deferred_enabled(false),
             _single_resource(false),
             _not_found_resource(0x0),
             _method_not_allowed_resource(0x0),
@@ -264,13 +264,13 @@ class create_webserver
         {
             _digest_auth_enabled = false; return *this;
         }
-        create_webserver& comet()
+        create_webserver& deferred()
         {
-            _comet_enabled = true; return *this;
+            _deferred_enabled = true; return *this;
         }
-        create_webserver& no_comet()
+        create_webserver& no_deferred()
         {
-            _comet_enabled = false; return *this;
+            _deferred_enabled = false; return *this;
         }
         create_webserver& regex_checking()
         {
@@ -351,7 +351,7 @@ class create_webserver
         bool _regex_checking;
         bool _ban_system_enabled;
         bool _post_process_enabled;
-        bool _comet_enabled;
+        bool _deferred_enabled;
         bool _single_resource;
         render_ptr _not_found_resource;
         render_ptr _method_not_allowed_resource;
diff --git a/src/httpserver/webserver.hpp b/src/httpserver/webserver.hpp
@@ -173,7 +173,7 @@ class webserver
         const bool regex_checking;
         const bool ban_system_enabled;
         const bool post_process_enabled;
-        const bool comet_enabled;
+        const bool deferred_enabled;
         bool single_resource;
         pthread_mutex_t mutexwait;
         pthread_rwlock_t runguard;
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -170,7 +170,7 @@ webserver::webserver(const create_webserver& params):
     regex_checking(params._regex_checking),
     ban_system_enabled(params._ban_system_enabled),
     post_process_enabled(params._post_process_enabled),
-    comet_enabled(params._comet_enabled),
+    deferred_enabled(params._deferred_enabled),
     single_resource(params._single_resource),
     not_found_resource(params._not_found_resource),
     method_not_allowed_resource(params._method_not_allowed_resource),
@@ -324,7 +324,7 @@ bool webserver::start(bool blocking)
         start_conf |= MHD_USE_DEBUG;
     if(pedantic)
         start_conf |= MHD_USE_PEDANTIC_CHECKS;
-    if(comet_enabled)
+    if(deferred_enabled)
         start_conf |= MHD_USE_SUSPEND_RESUME;
 
 #ifdef USE_FASTOPEN
diff --git a/test/integ/ws_start_stop.cpp b/test/integ/ws_start_stop.cpp
@@ -188,7 +188,7 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, disable_options)
         .no_pedantic()
         .no_basic_auth()
         .no_digest_auth()
-        .no_comet()
+        .no_deferred()
         .no_regex_checking()
         .no_ban_system()
         .no_post_process();
@@ -216,7 +216,7 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, enable_options)
     webserver ws = create_webserver(8080)
         .debug()
         .pedantic()
-        .comet()
+        .deferred()
         .regex_checking()
         .ban_system()
         .post_process();
