HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More tweaks of skeleton documentation wrt \n behavior at bol/eol.
[bpt/emacs.git]
/
lisp
/
net
/
network-stream.el
diff --git
a/lisp/net/network-stream.el
b/lisp/net/network-stream.el
index
ab7d02c
..
28e9d0c
100644
(file)
--- a/
lisp/net/network-stream.el
+++ b/
lisp/net/network-stream.el
@@
-1,6
+1,6
@@
;;; network-stream.el --- open network processes, possibly with encryption
;;; network-stream.el --- open network processes, possibly with encryption
-;; Copyright (C) 2010-201
3
Free Software Foundation, Inc.
+;; Copyright (C) 2010-201
4
Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: network
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: network
@@
-242,7
+242,8
@@
a greeting from the server.
(delete-process stream)
(setq start (with-current-buffer buffer (point-max)))
(let* ((starttls-extra-arguments
(delete-process stream)
(setq start (with-current-buffer buffer (point-max)))
(let* ((starttls-extra-arguments
- (if require-tls
+ (if (or require-tls
+ (member "--insecure" starttls-extra-arguments))
starttls-extra-arguments
;; For opportunistic TLS upgrades, we don't really
;; care about the identity of the peer.
starttls-extra-arguments
;; For opportunistic TLS upgrades, we don't really
;; care about the identity of the peer.