diff options
| author | Sam Varshavchik | 2021-02-23 19:19:18 -0500 |
|---|---|---|
| committer | Sam Varshavchik | 2021-02-23 19:19:18 -0500 |
| commit | b625f240f57362eb5e4eb84648cb31dc2554ad25 (patch) | |
| tree | 763bbfd99134081a63b0ce4801829f42b855ca21 /imap | |
| parent | a6e6ff2e38a390e66982210eb56972f9e3c00477 (diff) | |
| parent | 28942837952ede951b739a2f7167d3f2c2902fd8 (diff) | |
| download | courier-libs-b625f240f57362eb5e4eb84648cb31dc2554ad25.tar.bz2 | |
Merge branch 'alpn'
Diffstat (limited to 'imap')
| -rw-r--r-- | imap/imapd-ssl.dist.in.git | 9 | ||||
| -rw-r--r-- | imap/pop3d-ssl.dist.in.git | 7 |
2 files changed, 15 insertions, 1 deletions
diff --git a/imap/imapd-ssl.dist.in.git b/imap/imapd-ssl.dist.in.git index 35880c8..f6b1ae8 100644 --- a/imap/imapd-ssl.dist.in.git +++ b/imap/imapd-ssl.dist.in.git @@ -5,7 +5,7 @@ # Do not alter lines that begin with ##, they are used when upgrading # this configuration. # -# Copyright 2000 - 2019 Double Precision, Inc. See COPYING for +# Copyright 2000 - 2021 Double Precision, Inc. See COPYING for # distribution information. # # This configuration file sets various options for the Courier-IMAP server @@ -316,6 +316,13 @@ TLS_VERIFYPEER=NONE TLS_CACHEFILE=@localstatedir@/couriersslpop3cache TLS_CACHESIZE=524288 +##TLS_ALPN:0 +# +# Application level protocol negotiation should be enabled by default, and +# should be commented out only in case of compatibility issues. + +TLS_ALPN=imap + ##NAME: MAILDIRPATH:0 # # MAILDIRPATH - directory name of the maildir directory. diff --git a/imap/pop3d-ssl.dist.in.git b/imap/pop3d-ssl.dist.in.git index dd352cd..40508e1 100644 --- a/imap/pop3d-ssl.dist.in.git +++ b/imap/pop3d-ssl.dist.in.git @@ -313,6 +313,13 @@ TLS_VERIFYPEER=NONE TLS_CACHEFILE=@localstatedir@/couriersslimapcache TLS_CACHESIZE=524288 +##TLS_ALPN:0 +# +# Application level protocol negotiation should be enabled by default, and +# should be commented out only in case of compatibility issues. + +TLS_ALPN=pop3 + ##NAME: MAILDIRPATH:0 # # MAILDIRPATH - directory name of the maildir directory. |