Import/Merge of libtest latest.

[m6w6/libmemcached] / libtest / port.cc

diff --git a/libtest/port.cc b/libtest/port.cc
index 904a0addc5733d3ea4f8715057aa1befa8f0292a..17e03e494b6ca01f330db4adb6afe02d256055d4 100644 (file)
--- a/libtest/port.cc
+++ b/libtest/port.cc
@@ -69,12 +69,13 @@ struct socket_st {
 
   void release(in_port_t _arg)
   {
-    for(socket_port_t::iterator iter= _pair.begin();
-        iter != _pair.end();
-        iter++)
+    for (socket_port_t::iterator iter= _pair.begin();
+         iter != _pair.end();
+         ++iter)
     {
       if ((*iter).second == _arg)
       {
+        shutdown((*iter).first, SHUT_RDWR);
         close((*iter).first);
       }
     }
@@ -82,10 +83,11 @@ struct socket_st {
 
   ~socket_st()
   {
-    for(socket_port_t::iterator iter= _pair.begin();
-        iter != _pair.end();
-        iter++)
+    for (socket_port_t::iterator iter= _pair.begin();
+         iter != _pair.end();
+         ++iter)
     {
+      shutdown((*iter).first, SHUT_RDWR);
       close((*iter).first);
     }
   }