From 1811194dd069d747a665f0cb460038c4beb73785 Mon Sep 17 00:00:00 2001 From: Bryan Moyles Date: Mon, 23 Jul 2018 16:08:08 -0400 Subject: [PATCH 1/2] Send a header to signal that connections should be closed. --- src/api_server.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/api_server.cc b/src/api_server.cc index cb720e1b..d0890855 100644 --- a/src/api_server.cc +++ b/src/api_server.cc @@ -129,6 +129,7 @@ void MetadataApiServer::HandleMonitoredResource( conn->set_headers(std::map({ {"Content-Type", "application/json"}, + {"Connection", "close"}, {"Content-Length", std::to_string(response.size())}, })); conn->write(response); @@ -149,6 +150,7 @@ void MetadataApiServer::HandleMonitoredResource( conn->set_headers(std::map({ {"Content-Type", "application/json"}, + {"Connection", "close"}, {"Content-Length", std::to_string(response.size())}, })); conn->write(response); @@ -172,6 +174,7 @@ void MetadataApiServer::HandleHealthz( conn->set_headers(std::map({ {"Content-Type", "text/plain"}, + {"Connection", "close"}, {"Content-Length", std::to_string(response.size())}, })); conn->write(response); @@ -189,6 +192,7 @@ void MetadataApiServer::HandleHealthz( conn->set_headers(std::map({ {"Content-Type", "text/plain"}, + {"Connection", "close"}, {"Content-Length", std::to_string(response.size())}, })); conn->write(response); From 65cbd4398773a8a2b569b545261b739ca7c0fc77 Mon Sep 17 00:00:00 2001 From: Bryan Moyles Date: Mon, 23 Jul 2018 16:12:19 -0400 Subject: [PATCH 2/2] Alphabetize headers for readability. --- src/api_server.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api_server.cc b/src/api_server.cc index d0890855..90924015 100644 --- a/src/api_server.cc +++ b/src/api_server.cc @@ -128,9 +128,9 @@ void MetadataApiServer::HandleMonitoredResource( std::string response = resource.ToJSON()->ToString(); conn->set_headers(std::map({ - {"Content-Type", "application/json"}, {"Connection", "close"}, {"Content-Length", std::to_string(response.size())}, + {"Content-Type", "application/json"}, })); conn->write(response); } catch (const std::out_of_range& e) { @@ -149,9 +149,9 @@ void MetadataApiServer::HandleMonitoredResource( std::string response = json_response->ToString(); conn->set_headers(std::map({ - {"Content-Type", "application/json"}, {"Connection", "close"}, {"Content-Length", std::to_string(response.size())}, + {"Content-Type", "application/json"}, })); conn->write(response); } @@ -173,9 +173,9 @@ void MetadataApiServer::HandleHealthz( std::string response = "healthy"; conn->set_headers(std::map({ - {"Content-Type", "text/plain"}, {"Connection", "close"}, {"Content-Length", std::to_string(response.size())}, + {"Content-Type", "text/plain"}, })); conn->write(response); } else { @@ -191,9 +191,9 @@ void MetadataApiServer::HandleHealthz( std::string response = response_stream.str(); conn->set_headers(std::map({ - {"Content-Type", "text/plain"}, {"Connection", "close"}, {"Content-Length", std::to_string(response.size())}, + {"Content-Type", "text/plain"}, })); conn->write(response); }