From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 19 Dec 2017 22:14:18 +0000 (+0000)
Subject: Merge branch '4.next'
X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/d4fd1b83a197d73cbac114fe53f3448d8b5c7cc2

Merge branch '4.next'
---

d4fd1b83a197d73cbac114fe53f3448d8b5c7cc2
diff --cc doc/doc-docbook/spec.xfpt
index 48cb0155e,9c011a989..7440a4c06
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@@ -17116,7 -17139,9 +17116,8 @@@ separator in the usual way to avoid con
  &*Note*&: Under current versions of OpenSSL, when a list of more than one
  file is used, the &$tls_in_ourcert$& veriable is unreliable.
  
- &*Note*&: OCSP stapling is not usable when a list of more than one file is used.
+ &*Note*&: OCSP stapling is not usable under OpenSSL
+ when a list of more than one file is used.
 -.wen
  
  If the option contains &$tls_out_sni$& and Exim is built against OpenSSL, then
  if the OpenSSL build supports TLS extensions and the TLS client sends the
diff --cc doc/doc-txt/ChangeLog
index 824ae232e,fcd5e691f..d4b1820d5
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@@ -5,6 -5,14 +5,14 @@@ affect Exim's operation, with an unchan
  options, and new features, see the NewStuff file next to this ChangeLog.
  
  
 -Exim version 4.next
++Exim version 4.91
+ -----------------
+ 
+ JH/01 Replace the store_release() internal interface with store_newblock(),
+       which internalises the check required to safely use the old one, plus
+       the allocate and data copy operations duplicated in both (!) of the
+       extant use locations.
+ 
  Exim version 4.90
  -----------------
  
diff --cc doc/doc-txt/NewStuff
index 4261beb76,f53ce5741..df7055a36
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@@ -6,6 -6,16 +6,16 @@@ Before a formal release, there may be q
  test from the snapshots or the Git before the documentation is updated. Once
  the documentation is updated, this file is reduced to a short list.
  
 -Version 4.next
++Version 4.91
+ --------------
+ 
+  1. Dual-certificate stacks on servers now support OCSP stapling, under GnuTLS
+     version 3.5.6 or later.
+ 
+  2. DANE is now supported under GnuTLS version 3.0.0 or later (adding to the
+     previous OpenSSL implementation, but still Experimental).
+ 
+ 
  Version 4.90
  ------------