Mercurial > pidgin3 / changeset

--- a/ChangeLog	Thu Apr 01 05:26:44 2010 +0000
+++ b/ChangeLog	Thu Apr 01 06:51:04 2010 +0000
@@ -9,6 +9,8 @@
 	* Fix two related crashes in the GnuTLS and NSS plugins when they
 	  suffer internal errors immediately upon attempting to establish
 	  an SSL connection.
+	* Fix NSS to work when reinitialized after being used.  (Thanks to
+	  Ludovico Cavedon for the testcase)
 	* Added support for PURPLE_GNUTLS_PRIORITIES environment variable.
 	  This can be used to specify GnuTLS priorities on a per-host basis.
 	  The format is "host=priority;host2=priority;...".  The default

--- a/libpurple/plugins/ssl/ssl-nss.c	Thu Apr 01 05:26:44 2010 +0000
+++ b/libpurple/plugins/ssl/ssl-nss.c	Thu Apr 01 06:51:04 2010 +0000
@@ -235,6 +235,7 @@
 static void
 ssl_nss_uninit(void)
 {
+	NSS_Shutdown();
 	PR_Cleanup();
 
 	_nss_methods = NULL;