[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-165-gaf7a9a0

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  af7a9a097db1f9ca192cd51feea6378057104e77 (commit)
      from  06601b45ee04b9b78537879501a7d1aebb1b4296 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit af7a9a097db1f9ca192cd51feea6378057104e77
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Apr 18 01:47:58 2010 +0200

    Silent socket exceptions on connection cleanup

diff --git a/myserver/src/connection/connection.cpp 
b/myserver/src/connection/connection.cpp
index dc3d1b6..5091544 100644
--- a/myserver/src/connection/connection.cpp
+++ b/myserver/src/connection/connection.cpp
@@ -19,6 +19,7 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include "myserver.h"
 #include <include/connection/connection.h>
 #include <include/conf/vhost/vhost.h>
+#include <include/base/exceptions/exceptions.h>
 
 /*!
  * Initialize the structure.
@@ -51,12 +52,18 @@ void Connection::init ()
 void Connection::destroy ()
 {
   if (socket)
-  {
-    socket->shutdown (SHUT_RDWR);
-    socket->close ();
-    delete socket;
-    socket = NULL;
-  }
+    {
+      try
+        {
+          socket->shutdown (SHUT_RDWR);
+          socket->close ();
+          delete socket;
+          socket = NULL;
+        }
+      catch (SocketException & e)
+        {
+        }
+    }
 
   if (login)
     delete login;
@@ -78,7 +85,7 @@ void Connection::destroy ()
 
   /*! Remove the reference for the vhost. */
   if (host)
-    ((Vhost*)host)->removeRef ();
+    ((Vhost*) host)->removeRef ();
 
   login = NULL;
   password = NULL;

-----------------------------------------------------------------------

Summary of changes:
 myserver/src/connection/connection.cpp |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU MyServer