[gnus git] branch master updated: n0-17-17-gfd0ed7f =1= proto-stream.el (network-stream-open-starttls): Adjust to call `gnutls-negotiate' with :process and :hostname arguments.
Katsumi Yamaoka <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via fd0ed7fece7d25e8a046b180aeac5c904e56c013 (commit)
from 3fbc262458dbddd111157c60d196b524db4e5b9a (commit)
- Log -----------------------------------------------------------------
commit fd0ed7fece7d25e8a046b180aeac5c904e56c013
Author: Teodor Zlatanov <[email protected]>
Date: Wed May 4 11:38:00 2011 +0000
proto-stream.el (network-stream-open-starttls): Adjust to call `gnutls-negotiate' with :process and :hostname arguments.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 619a326..5423b64 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,9 @@
* registry.el (registry-reindex): Fix percentage message.
+ * proto-stream.el (network-stream-open-starttls): Adjust to call
+ `gnutls-negotiate' with :process and :hostname arguments.
+
2011-05-03 Teodor Zlatanov <[email protected]>
* shr.el: Add shr-link face for links.
diff --git a/lisp/proto-stream.el b/lisp/proto-stream.el
index e7718a5..417e070 100644
--- a/lisp/proto-stream.el
+++ b/lisp/proto-stream.el
@@ -51,9 +51,7 @@
(require 'tls)
(require 'starttls)
-(declare-function gnutls-negotiate "gnutls"
- (proc type host &optional priority-string trustfiles keyfiles
- verify-flags verify-error verify-hostname-error))
+(declare-function gnutls-negotiate "gnutls" (&rest spec))
;;;###autoload
(defun open-protocol-stream (name buffer host service &rest parameters)
@@ -187,7 +185,7 @@ PARAMETERS should be a sequence of keywords and values:
(proto-stream-command stream starttls-command eoc))
;; The server said it was OK to begin STARTTLS negotiations.
(if (fboundp 'open-gnutls-stream)
- (gnutls-negotiate stream nil host)
+ (gnutls-negotiate :process stream :hostname host)
(unless (starttls-negotiate stream)
(delete-process stream)))
(if (memq (process-status stream) '(open run))
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
lisp/ChangeLog | 3 +++
lisp/proto-stream.el | 6 ++----
2 files changed, 5 insertions(+), 4 deletions(-)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, master has been updated
hooks/post-receive
--
Gnus Project