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

diff --git a/lib/remote/httpresponse.cpp b/lib/remote/httpresponse.cpp
index fe67052c9ae70ac34d7c4fafecb80eff0592549c..ef0df7e81a2dad143bd733bfcd4c3f5f7a2d6661 100644 (file)
--- a/lib/remote/httpresponse.cpp
+++ b/lib/remote/httpresponse.cpp
@@ -111,6 +111,9 @@ void HttpResponse::Finish()
        }
 
        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)

diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp
index 4f619d2f176cf87057321bfbf10857c5321db873..cd3e542f27761d16d1ff34406d4f2d9103b46658 100644 (file)
--- a/lib/remote/httpserverconnection.cpp
+++ b/lib/remote/httpserverconnection.cpp
@@ -362,13 +362,6 @@ void HttpServerConnection::DataAvailableHandler()
 
                        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
                close = true;