diff options
| author | George Peter Banyard <girgias@php.net> | 2020-12-22 19:52:36 +0100 |
|---|---|---|
| committer | George Peter Banyard <girgias@php.net> | 2020-12-22 19:55:30 +0100 |
| commit | a80a02989629425cb2d9a70973f3aab56333710a (patch) | |
| tree | 4fed1967ba158cab07d0d5e4951f3f12f799b0d1 /ext/imap | |
| parent | caa710037e663fd78f67533b29611183090068b2 (diff) | |
| download | php-git-a80a02989629425cb2d9a70973f3aab56333710a.tar.gz | |
Optimize Dovecot configuration for IMAP tests
Closes GH-6531
Diffstat (limited to 'ext/imap')
| -rw-r--r-- | ext/imap/tests/imap_errors_basic.phpt | 2 | ||||
| -rw-r--r-- | ext/imap/tests/setup/dovecot.conf | 24 |
2 files changed, 19 insertions, 7 deletions
diff --git a/ext/imap/tests/imap_errors_basic.phpt b/ext/imap/tests/imap_errors_basic.phpt index f691a5c705..45d1ec8973 100644 --- a/ext/imap/tests/imap_errors_basic.phpt +++ b/ext/imap/tests/imap_errors_basic.phpt @@ -26,6 +26,4 @@ List any errors array(%d) { [0]=> string(%d) "%s" - [1]=> - string(%d) "%s" } diff --git a/ext/imap/tests/setup/dovecot.conf b/ext/imap/tests/setup/dovecot.conf index c465ba3ce9..21687a31e4 100644 --- a/ext/imap/tests/setup/dovecot.conf +++ b/ext/imap/tests/setup/dovecot.conf @@ -2,15 +2,29 @@ # Pigeonhole version 0.4.21 (92477967) listen = *, :: -# To make authentication work +# For SSL need to setup a certificate +# See https://wiki.dovecot.org/SSL/DovecotConfiguration ssl = no -disable_plaintext_auth = no -auth_mechanisms = plain cram-md5 +# Disable plaintext to prevent a warning at each login +disable_plaintext_auth = yes + +auth_mechanisms = cram-md5 auth_username_format = %u -auth_debug = yes auth_verbose = yes -#log +auth_debug = yes +auth_failure_delay = 1secs + +# This need dovecot 2.3.12. +# login_proxy_timeout = 500milliseconds +# ^ This would allow to kill login processes early, but needs testing. So would use v instead +# login_proxy_timeout = 5s +# There is a 1 second delay between each reconnection attempt. +# https://doc.dovecot.org/settings/core/#login-proxy-max-reconnects +# This need dovecot 2.3.12. +# login_proxy_max_reconnects = 3 + +# Log config log_path = /var/log/dovecot.log # If not set, use the value from log_path info_log_path = /var/log/dovecot-info.log |