summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Shaw <joe@ximian.com>2004-01-20 21:18:52 +0000
committerJoe Shaw <joeshaw@src.gnome.org>2004-01-20 21:18:52 +0000
commit46c7f5cd9ecb8d0cfd2e32de2c0643eeec906da2 (patch)
treef394969f9a707a2fe3312be73010c09c5422bcfc
parente01a9c299b4455d77d527fdbe46c13bca38210f3 (diff)
downloadlibsoup-46c7f5cd9ecb8d0cfd2e32de2c0643eeec906da2.tar.gz
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.
-rw-r--r--ChangeLog6
-rw-r--r--libsoup/soup-gnutls.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 954bf772..ea4d3729 100644
--- 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 dc6d5523..d3a291cb 100644
--- 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 *