]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: beast frontend calls shutdown before closing connections 24621/head
authorCasey Bodley <cbodley@redhat.com>
Thu, 5 Apr 2018 21:37:05 +0000 (17:37 -0400)
committerCasey Bodley <cbodley@redhat.com>
Tue, 16 Oct 2018 17:41:59 +0000 (13:41 -0400)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit fe5fb47ba5b91dee24dadfaa250327ace0f786d3)

src/rgw/rgw_asio_frontend.cc

index c848235c75782577256d6e25397328fb8e7cae5e..b160c4ef4d9b9970688f2397a8e1fc1eaad2e9cc 100644 (file)
@@ -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)));
   }
 }