git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Events: move from Experimental to mainline
[exim.git]
/
src
/
src
/
exim.c
diff --git
a/src/src/exim.c
b/src/src/exim.c
index e6777a3dbf1adb2936db7344079039f219edadb4..9e4dafe2f22ca5ae86e921db5a4788ea85f148b0 100644
(file)
--- a/
src/src/exim.c
+++ b/
src/src/exim.c
@@
-823,12
+823,21
@@
fprintf(f, "Support for:");
#ifndef DISABLE_DNSSEC
fprintf(f, " DNSSEC");
#endif
#ifndef DISABLE_DNSSEC
fprintf(f, " DNSSEC");
#endif
+#ifndef DISABLE_EVENT
+ fprintf(f, " Event");
+#endif
+#ifdef SUPPORT_I18N
+ fprintf(f, " I18N");
+#endif
#ifndef DISABLE_OCSP
fprintf(f, " OCSP");
#endif
#ifndef DISABLE_PRDR
fprintf(f, " PRDR");
#endif
#ifndef DISABLE_OCSP
fprintf(f, " OCSP");
#endif
#ifndef DISABLE_PRDR
fprintf(f, " PRDR");
#endif
+#ifdef SUPPORT_PROXY
+ fprintf(f, " PROXY");
+#endif
#ifdef SUPPORT_SOCKS
fprintf(f, " SOCKS");
#endif
#ifdef SUPPORT_SOCKS
fprintf(f, " SOCKS");
#endif
@@
-853,15
+862,6
@@
fprintf(f, "Support for:");
#ifdef EXPERIMENTAL_DSN_INFO
fprintf(f, " Experimental_DSN_info");
#endif
#ifdef EXPERIMENTAL_DSN_INFO
fprintf(f, " Experimental_DSN_info");
#endif
-#ifdef EXPERIMENTAL_INTERNATIONAL
- fprintf(f, " Experimental_International");
-#endif
-#ifdef EXPERIMENTAL_PROXY
- fprintf(f, " Experimental_Proxy");
-#endif
-#ifdef EXPERIMENTAL_EVENT
- fprintf(f, " Experimental_Event");
-#endif
#ifdef EXPERIMENTAL_REDIS
fprintf(f, " Experimental_Redis");
#endif
#ifdef EXPERIMENTAL_REDIS
fprintf(f, " Experimental_Redis");
#endif
@@
-1031,7
+1031,7
@@
DEBUG(D_any) do {
#ifdef SUPPORT_TLS
tls_version_report(f);
#endif
#ifdef SUPPORT_TLS
tls_version_report(f);
#endif
-#ifdef
EXPERIMENTAL_INTERNATIONAL
+#ifdef
SUPPORT_I18N
utf8_version_report(f);
#endif
utf8_version_report(f);
#endif
@@
-2561,12
+2561,12
@@
for (i = 1; i < argc; i++)
if (temp >= argrest && *temp == '.') f_end_dot = TRUE;
allow_domain_literals = TRUE;
strip_trailing_dot = TRUE;
if (temp >= argrest && *temp == '.') f_end_dot = TRUE;
allow_domain_literals = TRUE;
strip_trailing_dot = TRUE;
-#ifdef
EXPERIMENTAL_INTERNATIONAL
+#ifdef
SUPPORT_I18N
allow_utf8_domains = TRUE;
#endif
sender_address = parse_extract_address(argrest, &errmess,
&dummy_start, &dummy_end, &sender_address_domain, TRUE);
allow_utf8_domains = TRUE;
#endif
sender_address = parse_extract_address(argrest, &errmess,
&dummy_start, &dummy_end, &sender_address_domain, TRUE);
-#ifdef
EXPERIMENTAL_INTERNATIONAL
+#ifdef
SUPPORT_I18N
message_smtputf8 = string_is_utf8(sender_address);
allow_utf8_domains = FALSE;
#endif
message_smtputf8 = string_is_utf8(sender_address);
allow_utf8_domains = FALSE;
#endif
@@
-3736,7
+3736,7
@@
is equivalent to the ability to modify a setuid binary!
This needs to happen before we read the main configuration. */
init_lookup_list();
This needs to happen before we read the main configuration. */
init_lookup_list();
-#ifdef
EXPERIMENTAL_INTERNATIONAL
+#ifdef
SUPPORT_I18N
if (running_in_test_harness) smtputf8_advertise_hosts = NULL;
#endif
if (running_in_test_harness) smtputf8_advertise_hosts = NULL;
#endif
@@
-5121,7
+5121,7
@@
if (mua_wrapper)
deliver_drop_privilege = TRUE;
queue_smtp = FALSE;
queue_smtp_domains = NULL;
deliver_drop_privilege = TRUE;
queue_smtp = FALSE;
queue_smtp_domains = NULL;
-#ifdef
EXPERIMENTAL_INTERNATIONAL
+#ifdef
SUPPORT_I18N
message_utf8_downconvert = -1; /* convert-if-needed */
#endif
}
message_utf8_downconvert = -1; /* convert-if-needed */
#endif
}
@@
-5414,7
+5414,7
@@
while (more)
errors_sender_rc : EXIT_FAILURE;
}
errors_sender_rc : EXIT_FAILURE;
}
-#ifdef
EXPERIMENTAL_INTERNATIONAL
+#ifdef
SUPPORT_I18N
{
BOOL b = allow_utf8_domains;
allow_utf8_domains = TRUE;
{
BOOL b = allow_utf8_domains;
allow_utf8_domains = TRUE;
@@
-5422,7
+5422,7
@@
while (more)
recipient =
parse_extract_address(s, &errmess, &start, &end, &domain, FALSE);
recipient =
parse_extract_address(s, &errmess, &start, &end, &domain, FALSE);
-#ifdef
EXPERIMENTAL_INTERNATIONAL
+#ifdef
SUPPORT_I18N
if (string_is_utf8(recipient))
message_smtputf8 = TRUE;
else
if (string_is_utf8(recipient))
message_smtputf8 = TRUE;
else