Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Configurable smtputf8 #2866

Merged
merged 4 commits into from
Dec 3, 2020
Merged

Configurable smtputf8 #2866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4bdc8a5
Add a configuration option to advertise SMTPUTF8 support.
Dec 2, 2020
eeabdbd
Add documentation for configuration option to advertise SMTPUTF8 supp…
Dec 2, 2020
78b4465
Update connection.js
gene-hightower Dec 2, 2020
b2ec8da
add ability to disable SMTPUTF8 advertisement #2866
Dec 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@

## NEXT - 2020-MM-DD

### Changes

### New features

- add ability to disable SMTPUTF8 advertisement #2866

### Fixes

## 2.8.26 - 2020-11-18

Expand Down
3 changes: 3 additions & 0 deletions config/smtp.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
; wait for outbound connections to finish.
;force_shutdown_timeout=30

; Advertise support for SMTPTUF8 (RFC-6531)
;smtputf8=true

[headers]
;add_received=true
;clean_auth_results=true
Expand Down
5 changes: 4 additions & 1 deletion connection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,9 +918,12 @@ class Connection {
`${this.local.host} Hello ${this.get_remote('host')}${this.ehlo_hello_message}`,
"PIPELINING",
"8BITMIME",
"SMTPUTF8",
];

if (this.cfg.main.smtputf8) {
response.push("SMTPUTF8");
}

response.push(`SIZE ${this.max_bytes}`);

this.capabilities = response;
Expand Down
1 change: 1 addition & 0 deletions docs/CoreConfig.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ The list of plugins to load
specify -1 to disable spooling completely or 0 to force all messages to be spooled to disk.
* graceful\_shutdown - (default: false) enable this to wait for sockets on shutdown instead of closing them quickly
* force_shutdown_timeout - (default: 30) number of seconds to wait for a graceful shutdown
* smtputf8 - (default: true) advertise support for SMTPUTF8
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't it default false?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The default is enabled. See here

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah thanks :)


* me

Expand Down