Reduce rfc1413_query_timeout default from 30s to 5s.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 5fb45c043e02b9a23b81634a91197a76932b24e8..943b3bd8b677891d16f48daa98b87f3229838ae5 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.307 2006/02/16 17:03:16 jetmore Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.308 2006/02/20 16:31:48 ph10 Exp $

 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -205,6 +205,8 @@ JJ/05 exipick: Fixed bug where -bpc always showed a count of all messages
       on queue.  Changes to match documented behaviour of showing count of
       messages matching specified criteria.
 
       on queue.  Changes to match documented behaviour of showing count of
       messages matching specified criteria.
 

+PH/40 Changed the default ident timeout from 30s to 5s.
+

 
 Exim version 4.60
 -----------------
 
 Exim version 4.60
 -----------------

diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 5d3d87b7e65f2a79ccb3cc8d97d4cf34b04904b2..bd55514f192b6622f71e80c27c52951a73d877ad 100644 (file)
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/NewStuff,v 1.86 2006/02/14 16:18:14 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/NewStuff,v 1.87 2006/02/20 16:31:48 ph10 Exp $

 
 New Features in Exim
 --------------------
 
 New Features in Exim
 --------------------


@@ -60,6 +60,8 @@ PH/08 The default for dns_check_names_pattern now allows slashes within names,
       only to protect against broken name servers that fall over on strange
       characters, so the fact that it applies to all lookups doesn't matter.
 
       only to protect against broken name servers that fall over on strange
       characters, so the fact that it applies to all lookups doesn't matter.
 

+PH/09 The default for rfc4131_query_timeout has been changed from 30s to 5s.
+

 
 
 Version 4.60
 
 
 Version 4.60

diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt
index 3268b3cbe6a5c26e69d6a5744e4a878bd0bb4f98..17627e41c1bca230fa2ede3a930fbc2ca60076ab 100644 (file)
--- a/doc/doc-txt/OptionLists.txt
+++ b/doc/doc-txt/OptionLists.txt
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/OptionLists.txt,v 1.16 2006/02/10 14:25:43 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/OptionLists.txt,v 1.17 2006/02/20 16:31:48 ph10 Exp $

 
 LISTS OF EXIM OPTIONS
 ---------------------
 
 LISTS OF EXIM OPTIONS
 ---------------------


@@ -425,7 +425,7 @@ return_size_limit                    integer         100K          main
 rewrite                              boolean         true          redirect          4.00
 rewrite_headers                      boolean         true          dnslookup         4.00
 rfc1413_hosts                        host list       *             main
 rewrite                              boolean         true          redirect          4.00
 rewrite_headers                      boolean         true          dnslookup         4.00
 rfc1413_hosts                        host list       *             main

-rfc1413_query_timeout                time            30s           main
+rfc1413_query_timeout                time            5s            main

 router_home_directory                string*         unset         routers           4.11
 route_data                           string*         unset         manualroute       4.00
 route_list                           string list     unset         manualroute       4.00
 router_home_directory                string*         unset         routers           4.11
 route_data                           string*         unset         manualroute       4.00
 route_list                           string list     unset         manualroute       4.00

diff --git a/src/README.UPDATING b/src/README.UPDATING
index cfcc0837530df8d3deaa029e7dad00934f82c45b..05f89f40e12001bdb562aadfeef4db58217de06b 100644 (file)
--- a/src/README.UPDATING
+++ b/src/README.UPDATING
@@ -1,4 +1,4 @@
-$Cambridge: exim/src/README.UPDATING,v 1.10 2005/12/12 15:58:53 ph10 Exp $
+$Cambridge: exim/src/README.UPDATING,v 1.11 2006/02/20 16:31:49 ph10 Exp $

 
 This document contains detailed information about incompatibilities that might
 be encountered when upgrading from one release of Exim to another. The
 
 This document contains detailed information about incompatibilities that might
 be encountered when upgrading from one release of Exim to another. The


@@ -31,11 +31,13 @@ that might affect a running system.
 Exim version 4.61
 -----------------
 
 Exim version 4.61
 -----------------
 

-The default number of ACL variables of each type has been increased to 20, and
-it's possible to compile Exim with more. You can safely upgrade to this release
-if you already have messages on the queue with saved ACL variable values.
-However, if you downgrade from this release with messages on the queue, any
-saved ACL values they may have will be lost.
+1. The default number of ACL variables of each type has been increased to 20,
+and it's possible to compile Exim with more. You can safely upgrade to this
+release if you already have messages on the queue with saved ACL variable
+values. However, if you downgrade from this release with messages on the queue,
+any saved ACL values they may have will be lost.
+
+2. The default value for rfc1413_query_timeout has been changed from 30s to 5s.

 
 
 Exim version 4.54
 
 
 Exim version 4.54

diff --git a/src/src/configure.default b/src/src/configure.default
index 6b09309ad300e76607d02a2c800ed4f60740417f..e581288c66d85804e86bd10d86f15e5cd5d4d436 100644 (file)
--- a/src/src/configure.default
+++ b/src/src/configure.default
@@ -1,4 +1,4 @@
-# $Cambridge: exim/src/src/configure.default,v 1.6 2005/11/21 10:00:26 ph10 Exp $
+# $Cambridge: exim/src/src/configure.default,v 1.7 2006/02/20 16:31:49 ph10 Exp $

 
 ######################################################################
 #                  Runtime configuration file for Exim               #
 
 ######################################################################
 #                  Runtime configuration file for Exim               #


@@ -192,10 +192,11 @@ host_lookup = *
 # are disabled. RFC 1413 calls are cheap and can provide useful information
 # for tracing problem messages, but some hosts and firewalls have problems
 # with them. This can result in a timeout instead of an immediate refused
 # are disabled. RFC 1413 calls are cheap and can provide useful information
 # for tracing problem messages, but some hosts and firewalls have problems
 # with them. This can result in a timeout instead of an immediate refused

-# connection, leading to delays on starting up an SMTP session.
+# connection, leading to delays on starting up SMTP sessions. (The default was
+# reduced from 30s to 5s for release 4.61.)

 
 rfc1413_hosts = *
 
 rfc1413_hosts = *

-rfc1413_query_timeout = 30s
+rfc1413_query_timeout = 5s

 
 
 # By default, Exim expects all envelope addresses to be fully qualified, that
 
 
 # By default, Exim expects all envelope addresses to be fully qualified, that

diff --git a/src/src/globals.c b/src/src/globals.c
index 5dc7ccd37d97149701f2703db49f5cf36001a72c..58b0321450625c6d4e2b62ae9b94cb080ef5b8f0 100644 (file)
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/globals.c,v 1.50 2006/02/14 16:18:14 ph10 Exp $ */
+/* $Cambridge: exim/src/src/globals.c,v 1.51 2006/02/20 16:31:49 ph10 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -877,7 +877,7 @@ uschar *return_path            = NULL;
 BOOL    return_path_remove     = TRUE;
 int     rewrite_existflags     = 0;
 uschar *rfc1413_hosts          = US"*";
 BOOL    return_path_remove     = TRUE;
 int     rewrite_existflags     = 0;
 uschar *rfc1413_hosts          = US"*";

-int     rfc1413_query_timeout  = 30;
+int     rfc1413_query_timeout  = 5;

 /* BOOL    rfc821_domains         = FALSE;  <<< on the way out */
 uid_t   root_uid               = ROOT_UID;
 
 /* BOOL    rfc821_domains         = FALSE;  <<< on the way out */
 uid_t   root_uid               = ROOT_UID;