Events: move from Experimental to mainline

2 files changed, 3 insertions, 119 deletions

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 98755b60a..052495150 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -126,6 +126,9 @@ JH/27 Move Internationalisation support from Experimental to mainline, enabled
 JH/28 Bug 1745: Fix redis lookups to handle (quoted) spaces embedded in parts
       of the query string, and make ${quote_redis:} do that quoting.
 
+JH/29 Move Events support from Experimental to mainline, enabled by default
+      and removable for a build by defining DISABLE_EVENT.
+
 
 Exim version 4.86
 -----------------
diff --git a/doc/doc-txt/experimental-spec.txt b/doc/doc-txt/experimental-spec.txt
index aa4cb464d..81acfda5e 100644
--- a/doc/doc-txt/experimental-spec.txt
+++ b/doc/doc-txt/experimental-spec.txt
@@ -771,125 +771,6 @@ b. Configure, somewhere before the DATA ACL, the control option to
 
 
 
-Event Actions
---------------------------------------------------------------
-
-(Renamed from TPDA, Transport post-delivery actions)
-
-An arbitrary per-transport string can be expanded upon various transport events.
-Additionally a main-section configuration option can be expanded on some
-per-message events.
-This feature may be used, for example, to write exim internal log information
-(not available otherwise) into a database.
-
-In order to use the feature, you must compile with
-
-EXPERIMENTAL_EVENT=yes
-
-in your Local/Makefile
-
-and define one or both of
-- the event_action option in the transport
-- the event_action main option
-to be expanded when the event fires.
-
-A new variable, $event_name, is set to the event type when the
-expansion is done.  The current list of events is:
-
- msg:complete		after  main	  per message
- msg:delivery		after  transport  per recipient
- msg:rcpt:host:defer 	after  transport  per recipient per host
- msg:rcpt:defer 	after  transport  per recipient
- msg:host:defer		after  transport  per attempt
- msg:fail:delivery	after  main	  per recipient
- msg:fail:internal	after  main	  per recipient
- tcp:connect		before transport  per connection
- tcp:close		after  transport  per connection
- tls:cert		before both	  per certificate in verification chain
- smtp:connect		after  transport  per connection
-
-The expansion is called for all event types, and should use the $event_name
-variable to decide when to act.  The value of the variable is a colon-separated
-list, defining a position in the tree of possible events; it may be used as
-a list or just matched on as a whole.  There will be no whitespace.
-
-New event types may be added in the future.
-
-
-There is an auxilary variable, $event_data, for which the
-content is event_dependent:
-
-	msg:delivery		smtp confirmation mssage
-	msg:rcpt:host:defer	error string
-	msg:rcpt:defer		error string
-	msg:host:defer		error string
-	tls:cert		verification chain depth
-	smtp:connect		smtp banner
-
-The :defer events populate one extra variable, $event_defer_errno.
-
-The following variables are likely to be useful depending on the event type:
-
-	router_name, transport_name
-	local_part, domain
-	host, host_address, host_port
-	tls_out_peercert
-	lookup_dnssec_authenticated, tls_out_dane
-	sending_ip_address, sending_port
-	message_exim_id, verify_mode
-
-
-An example might look like:
-
-event_action = ${if eq {msg:delivery}{$event_name} \
-{${lookup pgsql {SELECT * FROM record_Delivery( \
-    '${quote_pgsql:$sender_address_domain}',\
-    '${quote_pgsql:${lc:$sender_address_local_part}}', \
-    '${quote_pgsql:$domain}', \
-    '${quote_pgsql:${lc:$local_part}}', \
-    '${quote_pgsql:$host_address}', \
-    '${quote_pgsql:${lc:$host}}', \
-    '${quote_pgsql:$message_exim_id}')}} \
-} {}}
-
-The string is expanded when each of the supported events occur
-and any side-effects of the expansion will happen.
-
-Note that for complex operations an ACL expansion can be used,
-however due to the multiple contexts the Exim operates in
-a) variables set in events raised from transports will not
-   be visible outside that transport call.
-b) acl_m variables in a server context are lost on a new connection,
-   and after helo/ehlo/mail/starttls/rset commands
-Using an ACL expansion with the logwrite modifier can be a
-useful way of writing to the main log.
-
-
-
-The expansion of the event_action option should normally
-return an empty string.  Should it return anything else the
-following will be forced:
-
-	msg:delivery	(ignored)
-	msg:host:defer	(ignored)
-	msg:fail:delivery (ignored)
-	tcp:connect	do not connect
-	tcp:close	(ignored)
-	tls:cert	refuse verification
-	smtp:connect	close connection
-
-No other use is made of the result string.
-
-If transport proxying is used, the remote IP/port during a
-tcp:connect event will be that of the proxy.
-
-
-Known issues:
-- the tls:cert event is only called for the cert chain elements
-  received over the wire, with GnuTLS.  OpenSSL gives the entire
-  chain including those loaded locally.
-
-
 Redis Lookup
 --------------------------------------------------------------