git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move the TLS resumption support from Experimental to mainline
[exim.git]
/
src
/
src
/
config.h.defaults
diff --git
a/src/src/config.h.defaults
b/src/src/config.h.defaults
index 55688295de20f9dc87dd70faa5b07a53c11911c8..1a1091f9c9dc71ca21c1360401660644c9098cb9 100644
(file)
--- a/
src/src/config.h.defaults
+++ b/
src/src/config.h.defaults
@@
-3,7
+3,7
@@
*************************************************/
/* Copyright (c) University of Cambridge 1995 - 2018 */
*************************************************/
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2018 */
+/* Copyright (c) The Exim Maintainers 2018
-2020
*/
/* See the file NOTICE for conditions of use and distribution. */
/* The default settings for Exim configuration variables. A #define without
/* See the file NOTICE for conditions of use and distribution. */
/* The default settings for Exim configuration variables. A #define without
@@
-49,8
+49,12
@@
Do not put spaces between # and the 'define'.
#define DISABLE_DNSSEC
#define DISABLE_DKIM
#define DISABLE_EVENT
#define DISABLE_DNSSEC
#define DISABLE_DKIM
#define DISABLE_EVENT
-#define DISABLE_PRDR
#define DISABLE_OCSP
#define DISABLE_OCSP
+#define DISABLE_PIPE_CONNECT
+#define DISABLE_PRDR
+#define DISABLE_QUEUE_RAMP
+#define DISABLE_TLS
+#define DISABLE_TLS_RESUME
#define DISABLE_D_OPTION
#define ENABLE_DISABLE_FSYNC
#define DISABLE_D_OPTION
#define ENABLE_DISABLE_FSYNC
@@
-142,6
+146,8
@@
Do not put spaces between # and the 'define'.
#define SUPPORT_CRYPTEQ
#define SUPPORT_DANE
#define SUPPORT_CRYPTEQ
#define SUPPORT_DANE
+#define SUPPORT_DMARC
+#define DMARC_TLD_FILE "/etc/exim/opendmarc.tlds"
#define SUPPORT_I18N
#define SUPPORT_I18N_2008
#define SUPPORT_MAILDIR
#define SUPPORT_I18N
#define SUPPORT_I18N_2008
#define SUPPORT_MAILDIR
@@
-152,7
+158,7
@@
Do not put spaces between # and the 'define'.
#define SUPPORT_PROXY
#define SUPPORT_SOCKS
#define SUPPORT_SPF
#define SUPPORT_PROXY
#define SUPPORT_SOCKS
#define SUPPORT_SPF
-#define SUPPORT_
TL
S
+#define SUPPORT_
SR
S
#define SUPPORT_TRANSLATE_IP_ADDRESS
#define SYSLOG_LOG_PID
#define SUPPORT_TRANSLATE_IP_ADDRESS
#define SYSLOG_LOG_PID
@@
-172,6
+178,7
@@
Do not put spaces between # and the 'define'.
#define USE_GDBM
#define USE_GNUTLS
#define AVOID_GNUTLS_PKCS11
#define USE_GDBM
#define USE_GNUTLS
#define AVOID_GNUTLS_PKCS11
+#define USE_OPENSSL
#define USE_READLINE
#define USE_TCP_WRAPPERS
#define USE_TDB
#define USE_READLINE
#define USE_TCP_WRAPPERS
#define USE_TDB
@@
-197,13
+204,9
@@
Do not put spaces between # and the 'define'.
#define EXPERIMENTAL_BRIGHTMAIL
#define EXPERIMENTAL_DCC
#define EXPERIMENTAL_DSN_INFO
#define EXPERIMENTAL_BRIGHTMAIL
#define EXPERIMENTAL_DCC
#define EXPERIMENTAL_DSN_INFO
-#define EXPERIMENTAL_DMARC
- #define DMARC_TLD_FILE "/etc/exim/opendmarc.tlds"
#define EXPERIMENTAL_LMDB
#define EXPERIMENTAL_LMDB
-#define EXPERIMENTAL_PIPE_CONNECT
-#define EXPERIMENTAL_REQUIRETLS
#define EXPERIMENTAL_QUEUEFILE
#define EXPERIMENTAL_QUEUEFILE
-#define EXPERIMENTAL_SRS
+#define EXPERIMENTAL_SRS
_ALT
/* For developers */
/* For developers */