projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert consecutive FSF copyright years to ranges.
[gnus]
/
lisp
/
tls.el
diff --git
a/lisp/tls.el
b/lisp/tls.el
index
9a1b0bb
..
42ae592
100644
(file)
--- a/
lisp/tls.el
+++ b/
lisp/tls.el
@@
-1,7
+1,6
@@
;;; tls.el --- TLS/SSL support via wrapper around GnuTLS
;;; tls.el --- TLS/SSL support via wrapper around GnuTLS
-;; Copyright (C) 1996, 1997, 1998, 1999, 2002, 2003, 2004, 2005, 2006,
-;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2002-2011 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org>
;; Keywords: comm, tls, gnutls, ssl
;; Author: Simon Josefsson <simon@josefsson.org>
;; Keywords: comm, tls, gnutls, ssl
@@
-75,8
+74,8
@@
and `gnutls-cli' (version 2.0.1) output."
:type 'regexp
:group 'tls)
:type 'regexp
:group 'tls)
-(defcustom tls-program '("gnutls-cli -p %p %h"
- "gnutls-cli -p %p %h --protocols ssl3"
+(defcustom tls-program '("gnutls-cli -
-insecure -
p %p %h"
+ "gnutls-cli -
-insecure -
p %p %h --protocols ssl3"
"openssl s_client -connect %h:%p -no_ssl2 -ign_eof")
"List of strings containing commands to start TLS stream to a host.
Each entry in the list is tried until a connection is successful.
"openssl s_client -connect %h:%p -no_ssl2 -ign_eof")
"List of strings containing commands to start TLS stream to a host.
Each entry in the list is tried until a connection is successful.
@@
-238,6
+237,10
@@
Fourth arg PORT is an integer specifying a port to connect to."
(setq process (start-process
name buffer shell-file-name shell-command-switch
formatted-cmd))
(setq process (start-process
name buffer shell-file-name shell-command-switch
formatted-cmd))
+ (funcall (if (fboundp 'set-process-query-on-exit-flag)
+ 'set-process-query-on-exit-flag
+ 'process-kill-without-query)
+ process nil)
(while (and process
(memq (process-status process) '(open run))
(progn
(while (and process
(memq (process-status process) '(open run))
(progn
@@
-298,5
+301,4
@@
match `%s'. Connect anyway? " host))))))
(provide 'tls)
(provide 'tls)
-;; arch-tag: 5596d1c4-facc-4bc4-94a9-9863b928d7ac
;;; tls.el ends here
;;; tls.el ends here