2003-10-13 Mikael Hallendal <micke@imendio.com>
authorhallski <hallski>
Mon, 13 Oct 2003 10:28:59 +0000
changeset 47 b633605d7428
parent 46 94b5c6394824
child 48 d913b0d5c7b6
2003-10-13 Mikael Hallendal <micke@imendio.com> * NEWS: Updated for 0.14.1 * configure.in: Bumped to 0.14.1 * loudmouth/lm-connection.c: (connection_in_event): check if bytes_read equals GNUTLS_E_AGAIN, fixes crash. Patch by Marinus Schraal.
ChangeLog
NEWS
configure.in
loudmouth/lm-connection.c
--- a/ChangeLog	Sun Oct 12 23:38:42 2003 +0000
+++ b/ChangeLog	Mon Oct 13 10:28:59 2003 +0000
@@ -1,3 +1,12 @@
+2003-10-13  Mikael Hallendal  <micke@imendio.com>
+
+	* NEWS: Updated for 0.14.1
+	
+	* configure.in: Bumped to 0.14.1
+	
+	* loudmouth/lm-connection.c: (connection_in_event): check if bytes_read
+	  equals GNUTLS_E_AGAIN, fixes crash. Patch by Marinus Schraal.
+
 2003-10-03  Mikael Hallendal  <micke@imendio.com>
 
         * Release 0.14
--- a/NEWS	Sun Oct 12 23:38:42 2003 +0000
+++ b/NEWS	Mon Oct 13 10:28:59 2003 +0000
@@ -1,3 +1,7 @@
+Changes in 0.14.1:
+------------------
+* Patch from foser@gentoo.org for a problem when using GnuTLS.
+
 Changes in 0.14:
 ----------------
 * Added information about building on Windows
--- a/configure.in	Sun Oct 12 23:38:42 2003 +0000
+++ b/configure.in	Mon Oct 13 10:28:59 2003 +0000
@@ -2,7 +2,7 @@
 
 AM_CONFIG_HEADER(config.h)
 
-AM_INIT_AUTOMAKE(loudmouth, 0.14)
+AM_INIT_AUTOMAKE(loudmouth, 0.14.1)
 
 AM_MAINTAINER_MODE
 
--- a/loudmouth/lm-connection.c	Sun Oct 12 23:38:42 2003 +0000
+++ b/loudmouth/lm-connection.c	Mon Oct 13 10:28:59 2003 +0000
@@ -437,7 +437,10 @@
 	if (connection->use_ssl) {
 		bytes_read = gnutls_record_recv (connection->gnutls_session,
 						 buf,IN_BUFFER_SIZE - 1);
-		if (bytes_read <= 0) {
+		if (bytes_read == GNUTLS_E_AGAIN) {
+			status = G_IO_STATUS_AGAIN;
+		}
+		else if (bytes_read <= 0) {
 			status = G_IO_STATUS_ERROR;
 			
 			//connection_error_event (connection->io_channel,