(open-tls-stream): In handshake-waiting loop,

don't wait more if there is output available to process.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e8bd115d64b1ee262ff078c5f868e1a2e7e8770f..32b3e71373d612fbb162513f29b61d55b223d211 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-18  Thien-Thi Nguyen  <ttn@gnu.org>
+
+       * net/tls.el (open-tls-stream): In handshake-waiting loop,
+       don't wait more if there is output available to process.
+
 2007-03-18  Nick Roberts  <nickrob@snap.net.nz>
 
        * progmodes/compile.el (compilation-find-file): Revert change

diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 3b6f0ac44be89afa42aef590ddc6b837af0764cb..9de74ca19d47e9e4f92bd1a6074d542795068061 100644 (file)
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -146,8 +146,8 @@ Fourth arg PORT is an integer specifying a port to connect to."
                      (set-buffer buffer) ;; XXX "blue moon" nntp.el bug
                      (goto-char (point-min))
                      (not (setq done (re-search-forward tls-success nil t)))))
-         (accept-process-output process 1)
-         (sit-for 1))
+         (unless (accept-process-output process 1)
+            (sit-for 1)))
        (message "Opening TLS connection with `%s'...%s" cmd
                 (if done "done" "failed"))
        (if done