throw connection_reset error is stream is closed

11 years ago · 207022a6bb
2 changed files with 7 additions and 2 deletions
--- a/HTTPServer.cpp
+++ b/HTTPServer.cpp
@ -416,9 +416,9 @@ namespace util
				@@ -416,9 +416,9 @@ namespace util
 		}
 		else
 		{
-			if (m_Stream && m_Stream->IsOpen ())
+			if (ecode == boost::asio::error::timed_out)
 				SendReply ("<html>" + itoopieImage + "<br>Not responding</html>", 504);
-			else
+			else 
 				Terminate ();
 		}
 	}
--- a/Streaming.h
+++ b/Streaming.h
@ -213,6 +213,11 @@ namespace stream
				@@ -213,6 +213,11 @@ namespace stream
 				return;
 			}	
 		}
+		if (!m_IsOpen)
+		{
+			handler (boost::asio::error::make_error_code (boost::asio::error::connection_reset), 0);
+			return;
+		}
 		m_ReceiveTimer.expires_from_now (boost::posix_time::seconds(timeout));
 		m_ReceiveTimer.async_wait ([=](const boost::system::error_code& ecode)
 			{ this->HandleReceiveTimer (ecode, buffer, handler); });