gnutls_bye() doesn't close the socket itself, so we need to do it or else

2004-01-20  Joe Shaw  <joe@ximian.com>

	* libsoup/soup-gnutls.c (soup_gnutls_close): gnutls_bye() doesn't
	close the socket itself, so we need to do it or else our
	connections stay in CLOSE_WAIT forever.

diff --git a/ChangeLog b/ChangeLog
index 954bf77..ea4d372 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-20  Joe Shaw  <joe@ximian.com>
+
+       * libsoup/soup-gnutls.c (soup_gnutls_close): gnutls_bye() doesn't
+       close the socket itself, so we need to do it or else our
+       connections stay in CLOSE_WAIT forever.
+
 2004-01-16  Jason Leach  <leach@wam.umd.edu>
 
        * libsoup/Makefile.am: builddir != srcdir fixes.

diff --git a/libsoup/soup-gnutls.c b/libsoup/soup-gnutls.c
index dc6d552..d3a291c 100644 (file)
--- a/libsoup/soup-gnutls.c
+++ b/libsoup/soup-gnutls.c
@@ -240,13 +240,7 @@ soup_gnutls_close (GIOChannel  *channel,
                         ret == GNUTLS_E_AGAIN);
        }
 
-#if 0
-       /* gnutls_bye closes the fd itself, so we shouldn't do this.
-        * All of this GIOChannel abuse makes me a little sick. */
        return chan->real_sock->funcs->io_close (channel, err);
-#else
-       return TRUE;
-#endif
 }
 
 static GSource *