Allow talking to STARTTLS servers that have no greeting

* net/network-stream.el (open-network-stream): Mention the new
:nogreeting parameter.
(network-stream-open-starttls): Use the :nogreeting parameter.

Fixes: debbugs:14938

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d7d3c9042265bd356f418857945dba681aa35213..62a11e229a1859ee3beac4a045b4534fa63ab583 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2013-07-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * net/network-stream.el (open-network-stream): Mention the new
+       :nogreeting parameter.
+       (network-stream-open-starttls): Use the :nogreeting parameter
+       (bug#14938).
+
        * net/shr.el (shr-mouse-browse-url): Remove and use `shr-browse-url'.
 
        * net/eww.el (eww-setup-buffer): Switching to the buffer seems

diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index fd21997ba288d8c8d74ac2ab873ccc51d222e44b..ab7d02cc80224c003c322d03c0867d07450bbf1c 100644 (file)
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -128,6 +128,9 @@ values:
 :use-starttls-if-possible is a boolean that says to do opportunistic
 STARTTLS upgrades even if Emacs doesn't have built-in TLS functionality.
 
+:nogreeting is a boolean that can be used to inhibit waiting for
+a greeting from the server.
+
 :nowait is a boolean that says the connection should be made
   asynchronously, if possible."
   (unless (featurep 'make-network-process)
@@ -211,7 +214,8 @@ STARTTLS upgrades even if Emacs doesn't have built-in TLS functionality.
         ;; Return (STREAM GREETING CAPABILITIES RESULTING-TYPE)
         (stream (make-network-process :name name :buffer buffer
                                       :host host :service service))
-        (greeting (network-stream-get-response stream start eoc))
+        (greeting (and (not (plist-get parameters :nogreeting))
+                       (network-stream-get-response stream start eoc)))
         (capabilities (network-stream-command stream capability-command
                                               eo-capa))
         (resulting-type 'plain)