Merge branch 'clemahieu-acceptor_infinite_loop'

aad3e275 · Tatsuhiro Tsujikawa · 7dddac08 · 1649948e · aad3e275
Commit aad3e275 authored Feb 04, 2017 by Tatsuhiro Tsujikawa
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

src/asio_server.cc src/asio_server.cc +3 -2

No files found.
--- a/src/asio_server.cc
+++ b/src/asio_server.cc
@@ -170,8 +170,9 @@ void server::start_accept(tcp::acceptor &acceptor, serve_mux &mux) {
          new_connection->start_read_deadline();
          new_connection->start();
        }
-
-        start_accept(acceptor, mux);
+        if (acceptor.is_open()) {
+          start_accept(acceptor, mux);
+        }
      });
 }