Fix connection close bug when response write over 5 seconds

PR ipkn#294 shyblue
rustyx · Feb 8, 2019 · 157760e · 157760e
1 parent 973909f
commit 157760e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/include/crow/dumb_timer_queue.h b/include/crow/dumb_timer_queue.h
@@ -30,7 +30,7 @@ namespace crow
                     self->dq_[index].second = nullptr;
             }
 
-            key add(std::function<void()> f)
+            key add(std::function<bool()> f)
             {
                 dq_.emplace_back(std::chrono::steady_clock::now(), std::move(f));
                 int ret = step_+dq_.size()-1;
@@ -54,7 +54,8 @@ namespace crow
                     {
                         CROW_LOG_DEBUG << "timer call: " << this << ' ' << step_;
                         // we know that timer handlers are very simple currenty; call here
-                        x.second();
+                        if (!x.second())
+                            break;
                     }
                     dq_.pop_front();
                     step_++;
@@ -74,7 +75,7 @@ namespace crow
 
             int tick{5};
             boost::asio::io_service* io_service_{};
-            std::deque<std::pair<decltype(std::chrono::steady_clock::now()), std::function<void()>>> dq_;
+            std::deque<std::pair<decltype(std::chrono::steady_clock::now()), std::function<bool()>>> dq_;
             int step_{};
         };
     }

diff --git a/include/crow/http_connection.h b/include/crow/http_connection.h
@@ -559,9 +559,15 @@ namespace crow
             {
                 if (!adaptor_.is_open())
                 {
-                    return;
+                    return true;
+                }
+                if (this->is_writing)
+                {
+                    CROW_LOG_DEBUG << this << " timer called functor but didn't close connection in writing";
+                    return false;
                 }
                 adaptor_.close();
+                return true;
             });
             CROW_LOG_DEBUG << this << " timer added: " << timer_cancel_key_.first << ' ' << timer_cancel_key_.second;
         }