X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fproto-stream.el;h=f7de1e5ec1d70967fda04ac9648977a32e37bc88;hb=8aa205d9bac6008fd7adbc35f5f1ef7594a0b551;hp=bc53864279b7879b67aff54414b5a66294de7a03;hpb=55c26cf1a9939dc7b28fcbab35f1d05d56d53242;p=gnus diff --git a/lisp/proto-stream.el b/lisp/proto-stream.el index bc5386427..f7de1e5ec 100644 --- a/lisp/proto-stream.el +++ b/lisp/proto-stream.el @@ -1,6 +1,6 @@ ;;; proto-stream.el --- negotiating TLS, STARTTLS and other connections -;; Copyright (C) 2010-2012 Free Software Foundation, Inc. +;; Copyright (C) 2010-2014 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: network @@ -275,11 +275,16 @@ PARAMETERS should be a sequence of keywords and values: (defun proto-stream-capability-open (start stream parameters stream-type) (let* ((capability-command (plist-get parameters :capability-command)) - (eoc (plist-get parameters :end-of-command)) - (greeting (proto-stream-get-response stream start eoc))) + (greeting (proto-stream-get-response + stream start + (plist-get parameters :end-of-command)))) (list stream greeting (and capability-command - (proto-stream-command stream capability-command eoc)) + (proto-stream-command + stream capability-command + (or + (plist-get parameters :end-of-capability) + (plist-get parameters :end-of-command)))) stream-type))) (provide 'proto-stream)