diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-08-08 10:48:26 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-08-08 10:48:26 +0000 |
| commit | 31480e424d1ac61f5d3a86d7913e5bd78c7d4d9b (patch) | |
| tree | e6746042407de3d8d9d68154df37d6782a5414cb /doc/doc-txt | |
| parent | 21f7af35452920c8ce83a0f90c63b68595b9e6a6 (diff) | |
Add sqlite_lock_timeout.
Diffstat (limited to 'doc/doc-txt')
| -rw-r--r-- | doc/doc-txt/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/doc-txt/NewStuff | 10 | ||||
| -rw-r--r-- | doc/doc-txt/OptionLists.txt | 3 |
3 files changed, 14 insertions, 3 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 2be9f29b6..2f3153030 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.201 2005/08/08 10:32:58 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.202 2005/08/08 10:48:26 ph10 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -71,6 +71,8 @@ PH/18 Reversed 4.52/PH/17 because the HP-UX user found it wasn't the cause of the problem. Specifically, suggested +O2 rather than +O1 for the HP-UX compiler. +PH/19 Added sqlite_lock_timeout option (David Woodhouse's patch). + Exim version 4.52 ----------------- diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff index 2d653616d..0a23d2d1b 100644 --- a/doc/doc-txt/NewStuff +++ b/doc/doc-txt/NewStuff @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/NewStuff,v 1.61 2005/08/02 15:19:20 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/NewStuff,v 1.62 2005/08/08 10:48:26 ph10 Exp $ New Features in Exim -------------------- @@ -42,6 +42,14 @@ PH/01 Support for SQLite database lookups has been added. This is another The only character affected by the ${quote_sqlite: operator is a single quote, which it doubles. + The SQLite library handles multiple simultaneous accesses to the database + internally. Multiple readers are permitted, but only one process can + update at once. Attempts to access the database while it is being updated + are rejected after a timeout period, during which the SQLite library + waits for the lock to be released. In Exim, the default timeout is set + to 5 seconds, but it can be changed by means of the sqlite_lock_timeout + option. + Note that you must set LOOKUP_SQLITE=yes in Local/Makefile in order to obtain SQLite support, and you will also need to add -lsqlite3 to the EXTRALIBS setting. And of course, you have to install SQLite on your diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt index 53b76d304..22b83e728 100644 --- 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.9 2005/06/21 14:14:55 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/OptionLists.txt,v 1.10 2005/08/08 10:48:26 ph10 Exp $ LISTS OF EXIM OPTIONS --------------------- @@ -474,6 +474,7 @@ socket string* unset lmtp spamd_address string + main 4.50 with content scan split_spool_directory boolean false main 1.70 spool_directory string ++ main +sqlite_lock_timeout time 5s main 4.53 srv_fail_domains domain list unset dnslookup 4.43 strip_excess_angle_brackets boolean false main strip_trailing_dot boolean false main |