From f79f1427c1bc86f7c9370ca905f9d5da93e60bc0 Mon Sep 17 00:00:00 2001
From: Colin Leroy <colin@colino.net>
Date: Mon, 16 Aug 2004 15:27:32 +0000
Subject: [PATCH] 2004-08-16 [colin]	0.9.12cvs63

	* src/common/ssl.c
		People with glibc 2.1 have had problems with non-blocking
		SSL_connect. Disable it for glibc < 2.2.
---
 ChangeLog.claws  | 6 ++++++
 PATCHSETS        | 1 +
 configure.ac     | 2 +-
 src/common/ssl.c | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 43e853398..9a3580d13 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2004-08-16 [colin]	0.9.12cvs63
+
+	* src/common/ssl.c
+		People with glibc 2.1 have had problems with non-blocking
+		SSL_connect. Disable it for glibc < 2.2.
+
 2004-08-16 [colin]	0.9.12cvs62
 
 	* src/common/ssl.c
diff --git a/PATCHSETS b/PATCHSETS
index 2e48035a8..37fa84353 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -45,3 +45,4 @@
 ( cvs diff -u -r 1.1 -r 1.2 src/plugins/pgpmime/plugin.c; ) > 0.9.12cvs61.patchset
 
 ( cvs diff -u -r 1.16 -r 1.17 src/common/ssl.c; ) > 0.9.12cvs62.patchset
+( cvs diff -u -r 1.17 -r 1.18 src/common/ssl.c; ) > 0.9.12cvs63.patchset
diff --git a/configure.ac b/configure.ac
index 74bdf8196..2b1e12f28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=62
+EXTRA_VERSION=63
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
diff --git a/src/common/ssl.c b/src/common/ssl.c
index f063ec818..5f483b1ec 100644
--- a/src/common/ssl.c
+++ b/src/common/ssl.c
@@ -87,7 +87,7 @@ void *SSL_connect_thread(void *data)
 
 gint SSL_connect_nb(SSL *ssl)
 {
-#ifdef USE_PTHREAD
+#if (defined USE_PTHREAD && defined __GLIBC__ && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 2)
 	thread_data *td = g_new0(thread_data, 1);
 	pthread_t pt;
 	void *res = NULL;
-- 
2.25.1