Skip to content

Commit

Permalink
HTTP requests ending normally are no longer logged as errors. referen…
Browse files Browse the repository at this point in the history
…ces #294
  • Loading branch information
zaphoyd committed Oct 10, 2013
1 parent 3d0d28a commit e16972b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions changelog.md
@@ -1,4 +1,6 @@
HEAD
- HTTP requests ending normally are no longer logged as errors. Thank you Banaan
for reporting. #294
- Eliminates spurious expired timers in certain error conditions. Thank you
Banaan for reporting. #295
- Consolidates all bundled library licenses into the COPYING file.
Expand Down
6 changes: 3 additions & 3 deletions websocketpp/impl/connection_impl.hpp
Expand Up @@ -1185,14 +1185,14 @@ void connection<config>::handle_send_http_response(
if (m_response.get_status_code() != http::status_code::switching_protocols)
{
if (m_processor) {
// if this was not a websocket connection, we have written
// the expected response and the connection can be closed.
} else {
// this was a websocket connection that ended in an error
std::stringstream s;
s << "Handshake ended with HTTP error: "
<< m_response.get_status_code();
m_elog.write(log::elevel::rerror,s.str());
} else {
// if this was not a websocket connection, we have written
// the expected response and the connection can be closed.
}
this->terminate(make_error_code(error::http_connection_ended));
return;
Expand Down

0 comments on commit e16972b

Please sign in to comment.