mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-06 20:49:33 +00:00
Code Issues Releases Activity

Fix stupid typo with gnutls-clii.

Browse Source 
Don't re-get capabilities unless we're reconnecting.
This commit is contained in:
Lars Magne Ingebrigtsen 2011-06-27 02:11:22 +02:00
parent 40098786b5
commit f6ab314e6e
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -1,5 +1,9 @@
2011-06-27 Lars Magne Ingebrigtsen <larsi@gnus.org>
* net/network-stream.el (network-stream-open-starttls): Don't
re-get capabilities unless we've reestablished connection.
(network-stream-open-starttls): Fix stupid typo with gnutls-clii.
* mail/smtpmail.el (smtpmail-via-smtp): Bind coding-system-for-*
to binary to possibly avoid line encoding issues on Windows (among
other things).

12
lisp/net/network-stream.el
View File

@ -223,7 +223,7 @@ functionality.
(or builtin-starttls
(and (or require-tls
(plist-get parameters :use-starttls-if-possible))
(executable-find "gnutls-clii")))
(executable-find "gnutls-cli")))
(not (eq (plist-get parameters :type) 'plain)))
;; If using external STARTTLS, drop this connection and start
;; anew with `starttls-open-stream'.
@ -246,11 +246,11 @@ functionality.
"--x509certfile" (expand-file-name (nth 1 cert)))
starttls-extra-arguments)))
(setq stream (starttls-open-stream name buffer host service)))
(network-stream-get-response stream start eoc))
;; Requery capabilities for protocols that require it; i.e.,
;; EHLO for SMTP.
(when (plist-get parameters :always-query-capabilities)
(network-stream-command stream capability-command eoc))
(network-stream-get-response stream start eoc)
;; Requery capabilities for protocols that require it; i.e.,
;; EHLO for SMTP.
(when (plist-get parameters :always-query-capabilities)
(network-stream-command stream capability-command eoc)))
(when (string-match success-string
(network-stream-command stream starttls-command eoc))
;; The server said it was OK to begin STARTTLS negotiations.