From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 5 Apr 2018 21:37:05 +0000 (-0400)
Subject: rgw: beast frontend calls shutdown before closing connections
X-Git-Tag: v12.2.11~117^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f24ddab904e52b708238aa280571c8bd3c5a5173;p=ceph.git

rgw: beast frontend calls shutdown before closing connections

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit fe5fb47ba5b91dee24dadfaa250327ace0f786d3)
---

diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc
index c848235c7578..b160c4ef4d9b 100644
--- a/src/rgw/rgw_asio_frontend.cc
+++ b/src/rgw/rgw_asio_frontend.cc
@@ -452,6 +452,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec)
           // ssl shutdown (ignoring errors)
           stream.async_shutdown(yield[ec]);
         }
+        s.shutdown(tcp::socket::shutdown_both, ec);
       }, std::placeholders::_1, std::move(socket)));
   } else {
 #else
@@ -462,6 +463,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec)
         beast::flat_buffer buffer;
         boost::system::error_code ec;
         handle_connection(env, s, buffer, false, ec, yield);
+        s.shutdown(tcp::socket::shutdown_both, ec);
       }, std::placeholders::_1, std::move(socket)));
   }
 }