Merge branch 'upstream/2.0.2'

1 files changed, 7 insertions, 2 deletions

diff --git a/util/net/miniwebserver.cpp b/util/net/miniwebserver.cpp
index 0793100..f0b5856 100644
--- a/util/net/miniwebserver.cpp
+++ b/util/net/miniwebserver.cpp
@@ -166,8 +166,13 @@ namespace mongo {
         ss << responseMsg;
         string response = ss.str();
 
-        sock.send( response.c_str(), response.size() , "http response" );
-        sock.close();
+        try {
+            sock.send( response.c_str(), response.size() , "http response" );
+            sock.close();
+        }
+        catch ( SocketException& e ) {
+            log(1) << "couldn't send data to http client: " << e << endl;
+        }
     }
 
     string MiniWebServer::getHeader( const char * req , string wanted ) {