From: Thien-Thi Nguyen Date: Sun, 18 Mar 2007 11:41:42 +0000 (+0000) Subject: (open-tls-stream): In handshake-waiting loop, X-Git-Tag: emacs-pretest-22.0.96~73 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=904bb06ca2720f78b96c0509c961dafa2f78d233;p=emacs.git (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 e8bd115d64b..32b3e71373d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-03-18 Thien-Thi Nguyen + + * 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 * progmodes/compile.el (compilation-find-file): Revert change diff --git a/lisp/net/tls.el b/lisp/net/tls.el index 3b6f0ac44be..9de74ca19d4 100644 --- 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