2011-09-20 [colin] 3.7.10cvs18
authorColin Leroy <colin@colino.net>
Tue, 20 Sep 2011 19:49:12 +0000 (19:49 +0000)
committerColin Leroy <colin@colino.net>
Tue, 20 Sep 2011 19:49:12 +0000 (19:49 +0000)
* src/common/ssl.c
Fix bug #2502, 'gnutls_transport_set_lowat removed in
gnutls 3.0.3'

ChangeLog
PATCHSETS
configure.ac
src/common/ssl.c

index 871c61d235ddd8a59ca84287b2f78122b6f157ed..3be82c11426aa160774ab00f929d0859043d2eac 100644 (file)
--- 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
index 0aaacef9c82f1ded1b24ac97c0b04a3625e1b651..cdf74c2b90a7c4e653004b342a9c3a7facf6e01c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index dc48234c054f11329750dc922d051bbe3c2e2124..9348f89e8f8d7bbe2a2b4d7c0c236c18010db8e7 100644 (file)
@@ -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=
 
index 0deb16e5dda46626350c28b140893df217b1d5ba..abb308e8de0e6eb4a2c87485f645df6f26d7ba3f 100644 (file)
@@ -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);