2008-04-25 [colin] 3.4.0cvs15
authorColin Leroy <colin@colino.net>
Fri, 25 Apr 2008 22:37:01 +0000 (22:37 +0000)
committerColin Leroy <colin@colino.net>
Fri, 25 Apr 2008 22:37:01 +0000 (22:37 +0000)
* src/common/ssl.c
Fix/simplify previous commit

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

index 33d126d8db497fb96ffacc314c138bdb78098003..104dad601673456eaa73a4a309f1cccb1c0d08e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-25 [colin]     3.4.0cvs15
+
+       * src/common/ssl.c
+               Fix/simplify previous commit
+
 2008-04-25 [colin]     3.4.0cvs14
 
        * src/addrindex.h
index 0a3cf1f639b4550e165ef20b3cc9f8f0b13d27f5..ec15a2574a6c585b9feaa0c8e4497c321f8418a8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.155.2.84 -r 1.155.2.85 src/Makefile.am;  diff -u /dev/null src/w32-logo.ico;  diff -u /dev/null src/w32-resource.rc;  ) > 3.4.0cvs12.patchset
 ( cvs diff -u -r 1.395.2.365 -r 1.395.2.366 src/summaryview.c;  ) > 3.4.0cvs13.patchset
 ( cvs diff -u -r 1.9.2.14 -r 1.9.2.15 src/addrindex.h;  cvs diff -u -r 1.9.2.26 -r 1.9.2.27 src/common/ssl.c;  cvs diff -u -r 1.4.2.26 -r 1.4.2.27 src/common/ssl_certificate.c;  ) > 3.4.0cvs14.patchset
+( cvs diff -u -r 1.9.2.27 -r 1.9.2.28 src/common/ssl.c;  ) > 3.4.0cvs15.patchset
index 2ecc00086305eb64633a0571912b66af375e0970..cd7e0678cbf322bfa2042e937df1af44786bc60d 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index c9432f08a125efbbf03a46a2cb545051df530686..09c14d0106094d7245c6db7cd9887e45aea78d52 100644 (file)
@@ -174,16 +174,12 @@ static gint SSL_connect_nb(gnutls_session ssl)
                        GPOINTER_TO_INT(res));
        
        return GPOINTER_TO_INT(res);
-#else
+#else /* USE_PTHREAD */
 #ifdef USE_OPENSSL
        return SSL_connect(ssl);
 #else
        do {
-#ifdef USE_PTHRED
-               result = gnutls_handshake(td->ssl);
-#else
                result = gnutls_handshake(ssl);
-#endif
        } while (result == GNUTLS_E_AGAIN || result == GNUTLS_E_INTERRUPTED);
 #endif
 #endif