[gnus git] branch master updated: n0-15-63-g33da5ba =1= Only do opportunistic STARTTLS upgrades if we have built-in gnutls support.

       via  33da5baf94e156abfb77c9a73ebb8e1d0be78a6d (commit)
      from  d0f0dd2c198f772401ff7ab2435c30dc7fe05668 (commit)


- Log -----------------------------------------------------------------
commit 33da5baf94e156abfb77c9a73ebb8e1d0be78a6d
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Tue Apr 12 20:29:44 2011 +0200

    Only do opportunistic STARTTLS upgrades if we have built-in gnutls support.
    
    Upgrades via gnutls-cli are too slow to be done opportunistically.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 347c7fb..b53c38a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2011-04-12  Lars Magne Ingebrigtsen  <[email protected]>
 
+	* proto-stream.el (proto-stream-open-starttls): Only do opportunistic
+	STARTTLS upgrades if we have built-in gnutls support.  Upgrades via
+	gnutls-cli are too slow to be done opportunistically.
+
 	* gnus-start.el (gnus-get-unread-articles): Slight cleanup.
 	(gnus-read-active-for-groups): Don't try to finish getting stuff where
 	we had no early-data returned.
diff --git a/lisp/proto-stream.el b/lisp/proto-stream.el
index 45cc974..0a055d0 100644
--- a/lisp/proto-stream.el
+++ b/lisp/proto-stream.el
@@ -160,9 +160,11 @@ PARAMETERS should be a sequence of keywords and values:
 	 (resulting-type 'plain)
 	 starttls-command)
 
-    ;; If we have STARTTLS support, try to upgrade the connection.
+    ;; If we have built-in STARTTLS support, try to upgrade the
+    ;; connection.
     (when (and (or (fboundp 'open-gnutls-stream)
-		   (executable-find "gnutls-cli"))
+		   (and require-tls
+			(executable-find "gnutls-cli")))
 	       capabilities success-string starttls-function
 	       (setq starttls-command
 		     (funcall starttls-function capabilities)))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog       |    4 ++++
 lisp/proto-stream.el |    6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project