[Emacs-diffs] trunk r113603: Allow talking to STARTTLS servers that have no greeting

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 113603
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14938
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Tue 2013-07-30 17:11:58 +0200
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/network-stream.el     
protostream.el-20101202222103-16uc9fa1d7v7rpbq-2

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-07-30 14:58:37 +0000
+++ b/lisp/ChangeLog    2013-07-30 15:11:58 +0000
@@ -1,5 +1,10 @@
 2013-07-30  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * 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

=== modified file 'lisp/net/network-stream.el'
--- a/lisp/net/network-stream.el        2013-02-16 02:45:24 +0000
+++ b/lisp/net/network-stream.el        2013-07-30 15:11:58 +0000
@@ -128,6 +128,9 @@
 :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 @@
         ;; 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)