Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-676

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 169-173)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

2005-12-16  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-art.el (gnus-signature-separator): Fix custom type.

   * lisp/gnus/mm-decode.el (mm-inlined-types): Fix custom type.
   (mm-keep-viewer-alive-types): Ditto.
   (mm-automatic-display): Ditto.
   (mm-attachment-override-types): Ditto.
   (mm-inline-override-types): Ditto.
   (mm-automatic-external-display): Ditto.

2005-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-art.el (gnus-buttonized-mime-types): Mention addition of
   multipart/alternative and add xref to mm-discouraged-alternatives
   in doc string.

   * lisp/gnus/mm-decode.el (mm-discouraged-alternatives): Add xref to
   gnus-buttonized-mime-types in doc string.

2005-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/rfc2047.el (rfc2047-charset-to-coding-system): Recognize
   us-ascii as a MIME charset.

   * lisp/gnus/mm-bodies.el (mm-decode-content-transfer-encoding): Protect
   against the case where the 2nd arg TYPE is nil.

2005-12-09  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-start.el (gnus-no-server-1): Mention
   `gnus-level-default-subscribed' in doc string.

2005-11-26  Dave Love  <fx@gnu.org>

   * lisp/gnus/tls.el (open-tls-stream): Rename arg SERVICE to PORT.
   (tls-program, tls-success): Provide openssl alternative.

   * lisp/gnus/starttls.el: Doc fixes.
   (starttls-open-stream-gnutls, starttls-open-stream): Rename arg
   SERVICE to PORT.

2005-12-09  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-start.el (gnus-start-draft-setup): Enforce
   `gnus-draft-mode' for nndraft:drafts at startup.

   * lisp/gnus/gnus.el (gnus-splash): Change custom group.
   (gnus-group-get-parameter, gnus-group-parameter-value): Describe
   allow-list argument.

   * lisp/gnus/gnus-agent.el (gnus-agent-article-alist-save-format): Format doc
   string.

2005-12-09  ARISAWA Akihiro  <ari@mbf.ocn.ne.jp>  (tiny change)

   * lisp/gnus/mm-decode.el (mm-display-external): Add lacked cdr.

2005-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (MIME Commands): Mention addition of
   multipart/alternative to gnus-buttonized-mime-types and add xref
   to mm-discouraged-alternatives.

   * man/emacs-mime.texi (Display Customization): Mention addition of
   "image/.*" and add xref to gnus-buttonized-mime-types in the
   mm-discouraged-alternatives section.

1 files changed, 13 insertions, 11 deletions

diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index ceebe4b33d5..e46c98b6f6a 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -56,7 +56,8 @@
   :group 'comm)
 
 (defcustom tls-program '("gnutls-cli -p %p %h"
-                         "gnutls-cli -p %p %h --protocols ssl3")
+                         "gnutls-cli -p %p %h --protocols ssl3"
+                         "openssl s_client -connect %h:%p -no_ssl2")
   "List of strings containing commands to start TLS stream to a host.
 Each entry in the list is tried until a connection is successful.
 %s is replaced with server hostname, %p with port to connect to.
@@ -64,6 +65,7 @@ The program should read input on stdin and write output to
 stdout.  Also see `tls-success' for what the program should output
 after successful negotiation."
   :type '(repeat string)
+  :version "22.1"
   :group 'tls)
 
 (defcustom tls-process-connection-type nil
@@ -72,9 +74,10 @@ after successful negotiation."
   :type 'boolean
   :group 'tls)
 
-(defcustom tls-success "- Handshake was completed"
+(defcustom tls-success "- Handshake was completed\\|SSL handshake has read "
   "*Regular expression indicating completed TLS handshakes.
-The default is what GNUTLS's \"gnutls-cli\" outputs."
+The default is what GNUTLS's \"gnutls-cli\" or OpenSSL's
+\"openssl s_client\" outputs."
   :version "22.1"
   :type 'regexp
   :group 'tls)
@@ -109,11 +112,11 @@ Used by `tls-certificate-information'."
             (push (cons (match-string 1) (match-string 2)) vals))
           (nreverse vals))))))
 
-(defun open-tls-stream (name buffer host service)
-  "Open a TLS connection for a service to a host.
+(defun open-tls-stream (name buffer host port)
+  "Open a TLS connection for a port to a host.
 Returns a subprocess-object to represent the connection.
 Input and output work as for subprocesses; `delete-process' closes it.
-Args are NAME BUFFER HOST SERVICE.
+Args are NAME BUFFER HOST PORT.
 NAME is name for process.  It is modified if necessary to make it unique.
 BUFFER is the buffer (or buffer-name) to associate with the process.
  Process output goes at end of that buffer, unless you specify
@@ -121,8 +124,7 @@ BUFFER is the buffer (or buffer-name) to associate with the process.
  BUFFER may be also nil, meaning that this process is not associated
  with any buffer
 Third arg is name of the host to connect to, or its IP address.
-Fourth arg SERVICE is name of the service desired, or an integer
-specifying a port number to connect to."
+Fourth arg PORT is an integer specifying a port to connect to."
   (let ((cmds tls-program) cmd done)
     (message "Opening TLS connection to `%s'..." host)
     (while (and (not done) (setq cmd (pop cmds)))
@@ -134,9 +136,9 @@ specifying a port number to connect to."
                         cmd
                         (format-spec-make
                          ?h host
-                         ?p (if (integerp service)
-                                (int-to-string service)
-                              service)))))
+                         ?p (if (integerp port)
+                                (int-to-string port)
+                              port)))))
              response)
         (while (and process
                     (memq (process-status process) '(open run))