tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restore 'Connection: close' behaviour in HTTP responses 

Actually the `corked` functionality caused problems with
not closing connections properly.

Full Analysis: https://github.com/Icinga/icinga2/issues/6799#issuecomment-443710338

Full credits to @swegener :)

fixes #6799
This commit is contained in:
Sven Wegener 2018-12-03 14:27:37 +01:00 committed by Michael Friedrich
parent 5ef23ee06d
commit a83dbc9de5
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/remote/httpresponse.cpp
View File

@ -111,6 +111,9 @@ void HttpResponse::Finish()
} }
m_State = HttpResponseEnd; m_State = HttpResponseEnd;
if (m_Request->ProtocolVersion == HttpVersion10 || m_Request->Headers->Get("connection") == "close")
m_Stream->Shutdown();
} }
bool HttpResponse::Parse(StreamReadContext& src, bool may_wait) bool HttpResponse::Parse(StreamReadContext& src, bool may_wait)

7
lib/remote/httpserverconnection.cpp
View File

@ -362,13 +362,6 @@ void HttpServerConnection::DataAvailableHandler()
close = true; close = true;
} }
/* Request finished, decide whether to explicitly close the connection. */
if (m_CurrentRequest.ProtocolVersion == HttpVersion10 ||
m_CurrentRequest.Headers->Get("connection") == "close") {
m_Stream->Shutdown();
close = true;
}
} else } else
close = true; close = true;