Skip to content

Commit 6a083a7

Browse files
authored
Update documentation for Implicit TLS (#16220)
As per RFC 8314, it is now recommended to prefer TLS over STARTTLS. Fix #16160 Signed-off-by: Andrew Thornton <[email protected]>
1 parent 681e81b commit 6a083a7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

custom/conf/app.example.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,8 +1387,8 @@ PATH =
13871387
;; Mail server
13881388
;; Gmail: smtp.gmail.com:587
13891389
;; QQ: smtp.qq.com:465
1390-
;; Using STARTTLS on port 587 is recommended per RFC 6409.
1391-
;; Note, if the port ends with "465", SMTPS will be used.
1390+
;; As per RFC 8314 using Implicit TLS/SMTPS on port 465 (if supported) is recommended,
1391+
;; otherwise STARTTLS on port 587 should be used.
13921392
;HOST =
13931393
;;
13941394
;; Disable HELO operation when hostnames are different.

docs/content/doc/advanced/config-cheat-sheet.en-us.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -550,9 +550,9 @@ Define allowed algorithms and their minimum key length (use -1 to disable a type
550550
- `DISABLE_HELO`: **\<empty\>**: Disable HELO operation.
551551
- `HELO_HOSTNAME`: **\<empty\>**: Custom hostname for HELO operation.
552552
- `HOST`: **\<empty\>**: SMTP mail host address and port (example: smtp.gitea.io:587).
553-
- Using opportunistic TLS via STARTTLS on port 587 is recommended per RFC 6409.
553+
- As per RFC 8314, if supported, Implicit TLS/SMTPS on port 465 is recommended, otherwise opportunistic TLS via STARTTLS on port 587 should be used.
554554
- `IS_TLS_ENABLED` : **false** : Forcibly use TLS to connect even if not on a default SMTPS port.
555-
- Note, if the port ends with `465` SMTPS/SMTP over TLS will be used despite this setting.
555+
- Note, if the port ends with `465` Implicit TLS/SMTPS/SMTP over TLS will be used despite this setting.
556556
- Otherwise if `IS_TLS_ENABLED=false` and the server supports `STARTTLS` this will be used. Thus if `STARTTLS` is preferred you should set `IS_TLS_ENABLED=false`.
557557
- `FROM`: **\<empty\>**: Mail from address, RFC 5322. This can be just an email address, or
558558
the "Name" \<[email protected]\> format.

0 commit comments

Comments
 (0)