talons

commit 4986940174630bcc63cb4cc12a0b923e7d0a90ef
parent 14ff3ca231e946d0f52e55afa6fe4d5f700c9348
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 20 Sep 2011 19:49:12 +0000

2011-09-20 [colin]	3.7.10cvs18

	* src/common/ssl.c
		Fix bug #2502, 'gnutls_transport_set_lowat removed in
		gnutls 3.0.3'

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/common/ssl.c
 | 
5
+++--

4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-20 [colin]	3.7.10cvs18
+
+	* src/common/ssl.c
+		Fix bug #2502, 'gnutls_transport_set_lowat removed in
+		gnutls 3.0.3'
+
 2011-09-18 [colin]	3.7.10cvs17
 
 	* src/news.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4221,3 +4221,4 @@
 ( cvs diff -u -r 1.654.2.4295 -r 1.654.2.4296 configure.ac;  cvs diff -u -r 1.9.2.47 -r 1.9.2.48 src/common/ssl.c;  ) > 3.7.10cvs15.patchset
 ( cvs diff -u -r 1.9.2.48 -r 1.9.2.49 src/common/ssl.c;  ) > 3.7.10cvs16.patchset
 ( cvs diff -u -r 1.101.2.67 -r 1.101.2.68 src/news.c;  ) > 3.7.10cvs17.patchset
+( cvs diff -u -r 1.9.2.49 -r 1.9.2.50 src/common/ssl.c;  ) > 3.7.10cvs18.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=18
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/ssl.c b/src/common/ssl.c
@@ -263,9 +263,10 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinfo, SSLMethod method)
 	r = gnutls_init(&session, GNUTLS_CLIENT);
 	if (session == NULL || r != 0)
 		return FALSE;
-  
-	gnutls_transport_set_lowat (session, 0); 
 
+#if GNUTLS_VERSION_NUMBER < 0x030003
+	gnutls_transport_set_lowat (session, 0); 
+#endif
 	gnutls_priority_set_direct(session, "NORMAL", NULL);
 	gnutls_record_disable_padding(session);