From: Jeremy Harris Date: Mon, 1 Jun 2020 16:07:44 +0000 (+0100) Subject: Merge branch '4.next' X-Git-Tag: exim-4.95-RC0~347 X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/da47dd4d092ba35e4f8ff055d79693cc1266c816 Merge branch '4.next' --- da47dd4d092ba35e4f8ff055d79693cc1266c816 diff --cc doc/doc-docbook/spec.xfpt index b154743c2,68f3b5b5a..28c8b1462 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@@ -4517,7 -4531,13 +4525,11 @@@ stage, the queue is scanned as if the & every domain. Addresses are routed, local deliveries happen, but no remote transports are run. -.new Performance will be best if the &%queue_run_in_order%& option is false. + If that is so and the &%queue_fast_ramp%& option is true then + in the first phase of the run, + once a threshold number of messages are routed for a given host, + a delivery process is forked in parallel with the rest of the scan. -.wen .cindex "hints database" "remembering routing" The hints database that remembers which messages are waiting for specific hosts @@@ -6681,6 -6710,8 +6700,7 @@@ If this is given and the looku (either underlying implementation or cached value) returns data, the result is replaced with a non-tainted version of the lookup key. + .cindex "tainted data" "de-tainting" -.wen .next .cindex "query-style lookup" "definition of" The &'query-style'& type accepts a generalized database query. No particular diff --cc doc/doc-txt/ChangeLog index 585deb042,e8f704839..a4526ca5c --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@@ -3,6 -3,14 +3,14 @@@ affect Exim's operation, with an unchan options, and new features, see the NewStuff file next to this ChangeLog. -Since Exim version 4.94 ----------------------- ++Exim version 4.95 ++----------------- + + JH/01 Bug 1329: Fix format of Maildir-format filenames to match other mail- + related applications. Previously an "H" was used where available info + says that "M" should be, so change to match. + + Exim version 4.94 ----------------- diff --cc src/src/configure.default index 3423ee0af,733a37615..946137fc9 --- a/src/src/configure.default +++ b/src/src/configure.default @@@ -804,10 -813,12 +813,9 @@@ begin transport remote_smtp: driver = smtp - message_size_limit = ${if > {$max_received_linelength}{998} {1}{0}} + .ifdef _HAVE_TLS_RESUME + tls_resumption_hosts = * -#endif -.ifdef _HAVE_PRDR - hosts_try_prdr = * + .endif # This transport is used for delivering messages to a smarthost, if the @@@ -845,7 -855,13 +852,10 @@@ smarthost_smtp .ifdef _HAVE_GNUTLS tls_require_ciphers = SECURE192:-VERS-SSL3.0:-VERS-TLS1.0:-VERS-TLS1.1 .endif + .ifdef _HAVE_TLS_RESUME + tls_resumption_hosts = * + .endif .endif -.ifdef _HAVE_PRDR - hosts_try_prdr = * -.endif # This transport is used for local delivery to user mailboxes in traditional diff --cc test/stderr/2610 index 925fb914b,4cc8801f7..657f115e9 --- a/test/stderr/2610 +++ b/test/stderr/2610 @@@ -164,13 -172,14 +175,14 @@@ dropping to exim gid; retaining priv ui search_open: mysql "NULL" cached open search_find: file="NULL" - key="servers=localhost(TESTSUITE/mysql/sock)/test/root/; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=localhost(TESTSUITE/mysql/sock)/test/root/pass; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=mysql key="servers=localhost(TESTSUITE/mysql/sock)/test/root/; select name from them where id='ph10';" opts=NULL - database lookup required for servers=localhost(TESTSUITE/mysql/sock)/test/root/; select name from them where id='ph10'; - MySQL query: "servers=localhost(TESTSUITE/mysql/sock)/test/root/; select name from them where id='ph10';" opts 'NULL' + type=mysql key="servers=localhost(TESTSUITE/mysql/sock)/test/root/pass; select name from them where id='ph10';" opts=NULL + database lookup required for servers=localhost(TESTSUITE/mysql/sock)/test/root/pass; select name from them where id='ph10'; + MySQL query: "servers=localhost(TESTSUITE/mysql/sock)/test/root/pass; select name from them where id='ph10';" opts 'NULL' MYSQL new connection: host=localhost port=0 socket=TESTSUITE/mysql/sock database=test user=root + creating new cache entry lookup yielded: Philip Hazel search_open: mysql "NULL" cached open @@@ -263,16 -275,17 +278,17 @@@ check set acl_m0 = ok: ${lookup mysq search_open: mysql "NULL" cached open search_find: file="NULL" - key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=127.0.0.1::1223/test/root/" + key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=127.0.0.1::1223/test/root/pass" LRU list: internal_search_find: file="NULL" - type=mysql key="select name from them where id = 'c'" opts="servers=127.0.0.1::1223/test/root/" + type=mysql key="select name from them where id = 'c'" opts="servers=127.0.0.1::1223/test/root/pass" cached data found but wrong opts; database lookup required for select name from them where id = 'c' - MySQL query: "select name from them where id = 'c'" opts 'servers=127.0.0.1::1223/test/root/' + MySQL query: "select name from them where id = 'c'" opts 'servers=127.0.0.1::1223/test/root/pass' MYSQL using cached connection for 127.0.0.1:1223/test/root MYSQL: no data found + replacing old cache entry lookup failed -check set acl_m0 = ok: ${lookup mysql,servers=127.0.0.1::1223/test/root/ {select name from them where id = '$local_part'}} +check set acl_m0 = ok: ${lookup mysql,servers=127.0.0.1::1223/test/root/pass {select name from them where id = '$local_part'}} = ok: search_open: mysql "NULL" cached open