diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2010-09-27 16:35:22 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2010-09-27 16:35:22 +0200 |
| commit | d2e9d0bbb2d63fc9588d8b2a13b46be8c67dd944 (patch) | |
| tree | 18d0ef16bc60414186e2da5848266546f5ce077f /lisp | |
| parent | 14db1c41108e7d2874ec9c5fb653f154228acd7b (diff) | |
| download | emacs-d2e9d0bbb2d63fc9588d8b2a13b46be8c67dd944.tar.gz emacs-d2e9d0bbb2d63fc9588d8b2a13b46be8c67dd944.tar.bz2 emacs-d2e9d0bbb2d63fc9588d8b2a13b46be8c67dd944.zip | |
Add debugging to the gnutls library, and finish handshaking when it's done.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/gnutls.el | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d7cde04306b..cd30925d9fb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-09-27 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * net/gnutls.el (starttls-negotiate): Stop looping when we get a t + back. + 2010-09-26 Stefan Monnier <monnier@iro.umontreal.ca> * emacs-lisp/pcase.el (pcase-let*, pcase-let): plet -> pcase-let. diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el index 7a2571f8a7c..b393d237d90 100644 --- a/lisp/net/gnutls.el +++ b/lisp/net/gnutls.el @@ -80,13 +80,11 @@ CREDENTIALS-FILE is a filename with meaning dependent on CREDENTIALS." (let ((ret 'gnutls-e-again) (n 25000)) - (while (and (not (gnutls-error-fatalp ret)) + (while (and (not (eq ret t)) + (not (gnutls-error-fatalp ret)) (> n 0)) (setq n (1- n)) - (gnutls-message-maybe - (setq ret (gnutls-handshake proc)) - "handshake: %s") - ;(debug "handshake ret" ret (gnutls-error-string ret))) + (setq ret (gnutls-handshake proc)) ) (if (gnutls-errorp ret) (progn |