[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114541: * net/network-stream.el (network-stream-ope
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] trunk r114541: * net/network-stream.el (network-stream-open-starttls): Don't add |
Date: |
Sun, 06 Oct 2013 17:14:15 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114541
revision-id: address@hidden
parent: address@hidden
author: Dato Simó <address@hidden>
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sun 2013-10-06 19:14:11 +0200
message:
* net/network-stream.el (network-stream-open-starttls): Don't add
--insecure if it's already present, because that gnutls-cli
rejects getting that parameter twice.
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-10-06 00:46:28 +0000
+++ b/lisp/ChangeLog 2013-10-06 17:14:11 +0000
@@ -1,3 +1,9 @@
+2013-10-06 Dato Simó <address@hidden> (tiny change)
+
+ * net/network-stream.el (network-stream-open-starttls): Don't add
+ --insecure if it's already present, because that gnutls-cli
+ rejects getting that parameter twice.
+
2013-10-06 Dmitry Gutov <address@hidden>
* progmodes/ruby-mode.el (ruby-smie-rules): Dedent `ensure'
=== modified file 'lisp/net/network-stream.el'
--- a/lisp/net/network-stream.el 2013-07-30 15:11:58 +0000
+++ b/lisp/net/network-stream.el 2013-10-06 17:14:11 +0000
@@ -242,7 +242,8 @@
(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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114541: * net/network-stream.el (network-stream-open-starttls): Don't add,
Lars Ingebrigtsen <=