@@ -529,9 +529,15 @@ void HTTPConnection::loop() {
             // Now we need to check if we can use keep-alive to reuse the SSL connection
             // However, if the client did not set content-size or defined connection: close,
             // we have no chance to do so.
+            // Also, the programmer may have explicitly set Connection: close for the response.
+            std::string hConnection = res.getHeader("Connection");
+            if (hConnection == "close") {
+              _isKeepAlive = false;
+            }
             if (!_isKeepAlive) {
               // No KeepAlive -> We are done. Transition to next state.
               if (!isClosed()) {
+                res.finalize();
                 _connectionState = STATE_BODY_FINISHED;
               }
             } else {
 
@@ -52,6 +52,15 @@ void HTTPResponse::setHeader(std::string const &name, std::string const &value)
   _headers.set(new HTTPHeader(name, value));
 }
 
+std::string HTTPResponse::getHeader(std::string const &name) {
+  HTTPHeader * h = _headers.get(name);
+  if (h != NULL) {
+    return h->_value;
+  } else {
+    return std::string();
+  }
+}
+
 bool HTTPResponse::isHeaderWritten() {
   return _headerWritten;
 }
 
@@ -32,6 +32,7 @@ class HTTPResponse : public Print {
   uint16_t getStatusCode();
   std::string getStatusText();
   void setHeader(std::string const &name, std::string const &value);
+  std::string getHeader(std::string const &name);
   bool isHeaderWritten();
 
   void printStd(std::string const &str);