Do the gnutls handshake from the reader loop, instead of looping over

the handshake from Emacs Lisp.

2 files changed, 2 insertions, 11 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 44cb82b4c7b..3ca07c33e15 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,8 @@
 2010-09-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * net/gnutls.el (starttls-negotiate): Loop a lot longer.
+        (starttls-negotiate): Just call boot, and let the handshake be
+        triggered from the read loop.
 
 2010-09-29  Glenn Morris  <rgm@gnu.org>
 
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index e1d093ebf79..27d44d32bd3 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -87,17 +87,6 @@ CREDENTIALS-FILE is a filename with meaning dependent on CREDENTIALS."
                             nil nil gnutls-log-level))
      "boot: %s")
 
-    (when (gnutls-errorp ret)
-      (error "Could not boot GnuTLS for this process"));
-
-    (let ((ret 'gnutls-e-again)
-          (n 250000))
-      (while (and (not (eq ret t))
-                  (not (gnutls-error-fatalp ret))
-                  (> n 0))
-        (setq n (1- n))
-        (setq ret (gnutls-handshake proc)))
-      (message "Handshake complete %s." ret))
     proc))
 
 (defun starttls-open-stream (name buffer host service)