From 92d082b74d59a5f9c8f3ebf57c8303cd2e787e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 2 Mar 2017 11:07:00 +0100 Subject: [PATCH] Don't crash hard on shutdown if sharing ISOs over the network --- ext/native/net/http_server.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ext/native/net/http_server.cpp b/ext/native/net/http_server.cpp index 45fb1fe8b4..57ceab984b 100644 --- a/ext/native/net/http_server.cpp +++ b/ext/native/net/http_server.cpp @@ -177,16 +177,17 @@ bool Server::RunSlice(double timeout) { return false; } - sockaddr client_addr; - socklen_t client_addr_size = sizeof(client_addr); - int conn_fd = accept(listener_, &client_addr, &client_addr_size); - if (conn_fd >= 0) { + sockaddr client_addr; + socklen_t client_addr_size = sizeof(client_addr); + int conn_fd = accept(listener_, &client_addr, &client_addr_size); + if (conn_fd >= 0) { executor_->Run(std::bind(&Server::HandleConnection, this, conn_fd)); return true; - } else { - FLOG("socket accept failed: %i", conn_fd); + } + else { + ELOG("socket accept failed: %i", conn_fd); return false; - } + } } bool Server::Run(int port) {