From 4c841a1f0cf53d363d2ba3351c558ce8b06e9c25 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 8 Feb 2008 22:02:00 +0000
Subject: [PATCH] - Mike Hommey filed and fixed bug report #1889856  
 (http://curl.haxx.se/bug/view.cgi?id=1889856): When using the gnutls ssl  
 layer, cleaning-up and reinitializing curl ends up with https requests  
 failing with "ASN1 parser: Element was not found" errors. Obviously a  
 regression added in 7.16.3.

---
 CHANGES       | 7 +++++++
 RELEASE-NOTES | 3 ++-
 lib/gtls.c    | 4 +++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index fc9932c841..98e29d9b6a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,13 @@
 
                                   Changelog
 
+Daniel S (8 Feb 2008)
+- Mike Hommey filed and fixed bug report #1889856
+  (http://curl.haxx.se/bug/view.cgi?id=1889856): When using the gnutls ssl
+  layer, cleaning-up and reinitializing curl ends up with https requests
+  failing with "ASN1 parser: Element was not found" errors. Obviously a
+  regression added in 7.16.3.
+
 Yang Tse (8 Feb 2008)
 - Improved test harness SCP/SFTP start up server verification, doing a real
   connection to the sftp server, authenticating and running a simple sftp
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b71c20fcf5..36f1a7f0ce 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -17,6 +17,7 @@ This release includes the following bugfixes:
 
  o improved pipelining
  o improved strdup replacement
+ o GnuTLS-built libcurl failed when doing global cleanup and reinit
 
 This release includes the following known bugs:
 
@@ -34,6 +35,6 @@ This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
  Michal Marek, Dmitry Kurochkin, Niklas Angebrand, Günter Knauf, Yang Tse,
- Dan Fandrich
+ Dan Fandrich, Mike Hommey
 
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/lib/gtls.c b/lib/gtls.c
index d317d2bb03..01ea303bb4 100644
--- a/lib/gtls.c
+++ b/lib/gtls.c
@@ -110,8 +110,10 @@ static int _Curl_gtls_init(void)
 
 int Curl_gtls_cleanup(void)
 {
-  if(gtls_inited)
+  if(gtls_inited) {
     gnutls_global_deinit();
+    gtls_inited = FALSE;
+  }
   return 1;
 }