tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 07:34:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6814 from Icinga/bugfix/conn-close-stall

Browse Source 
Restore 'Connection: close' behaviour in HTTP responses
This commit is contained in:
Michael Friedrich 2018-12-04 16:06:53 +01:00 committed by GitHub
commit 6cd8b7be32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/remote/httpresponse.cpp
View File

@ -111,6 +111,15 @@ void HttpResponse::Finish()
} }
m_State = HttpResponseEnd; m_State = HttpResponseEnd;
/* Close the connection on
* a) HTTP/1.0
* b) Connection: close in the sent header.
*
* Do this here and not in DataAvailableHandler - there might still be incoming data in there.
*/
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;