Merge pull request qicosmos#204 from KidContainer/master

fix keep alive
summerinsects · Nov 5, 2021 · 9b1b350 · 9b1b350
2 parents ef0ba57 + 7aef6d0
commit 9b1b350
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/include/cinatra/connection.hpp b/include/cinatra/connection.hpp
@@ -181,6 +181,10 @@ class connection : public base_connection,
 
   auto &get_tag() { return tag_; }
 
+  bool get_keep_alive(){
+    return keep_alive_;
+  }
+
   template <typename... Fs> void send_ws_string(std::string msg, Fs &&...fs) {
     send_ws_msg(std::move(msg), opcode::text, std::forward<Fs>(fs)...);
   }
@@ -253,6 +257,9 @@ class connection : public base_connection,
                                }
 
                                call_back();
+                               if(keep_alive_){
+                                  do_read();
+                               }
                              });
   }
 

diff --git a/include/cinatra/http_server.hpp b/include/cinatra/http_server.hpp
@@ -348,7 +348,8 @@ class http_server_ : private noncopyable {
           } break;
           case cinatra::data_proc_state::data_end: {
             auto conn = req.get_conn<ScoketType>();
-            conn->on_close();
+            if(!conn->get_keep_alive())
+              conn->on_close();
           } break;
           case cinatra::data_proc_state::data_all_end: {
             // network error