Skip to content

Commit 6ad6c0d

Browse files
author
Serghey Rodin
committed
rfc2047 in autoreply + utf8 headers
1 parent 930398c commit 6ad6c0d

File tree

14 files changed

+28
-14
lines changed

14 files changed

+28
-14
lines changed

install/debian/7/exim/exim4.conf.template

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,8 @@ userautoreply:
348348
driver = autoreply
349349
file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg
350350
from = "${local_part}@${domain}"
351-
subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}"
351+
headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit
352+
subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}"
352353
to = "${sender_address}"
353354

354355
devnull:

install/debian/8/exim/exim4.conf.template

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,8 @@ userautoreply:
351351
driver = autoreply
352352
file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg
353353
from = "${local_part}@${domain}"
354-
subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}"
354+
headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit
355+
subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}"
355356
to = "${sender_address}"
356357

357358
devnull:

install/rhel/5/exim/exim.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,8 @@ userautoreply:
347347
driver = autoreply
348348
file = /etc/exim/domains/$domain/autoreply.${local_part}.msg
349349
from = "${local_part}@${domain}"
350-
subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}"
350+
headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit
351+
subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}"
351352
to = "${sender_address}"
352353

353354
devnull:

install/rhel/6/exim/exim.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,8 @@ userautoreply:
348348
driver = autoreply
349349
file = /etc/exim/domains/$domain/autoreply.${local_part}.msg
350350
from = "${local_part}@${domain}"
351-
subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}"
351+
headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit
352+
subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}"
352353
to = "${sender_address}"
353354

354355
devnull:

install/rhel/7/exim/exim.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,8 @@ userautoreply:
350350
driver = autoreply
351351
file = /etc/exim/domains/$domain/autoreply.${local_part}.msg
352352
from = "${local_part}@${domain}"
353-
subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}"
353+
headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit
354+
subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}"
354355
to = "${sender_address}"
355356

356357
devnull:

install/ubuntu/12.04/exim/exim4.conf.template

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,8 @@ userautoreply:
347347
driver = autoreply
348348
file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg
349349
from = "${local_part}@${domain}"
350-
subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}"
350+
headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit
351+
subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}"
351352
to = "${sender_address}"
352353

353354
devnull:

install/ubuntu/12.10/exim/exim4.conf.template

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,8 @@ userautoreply:
347347
driver = autoreply
348348
file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg
349349
from = "${local_part}@${domain}"
350-
subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}"
350+
headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit
351+
subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}"
351352
to = "${sender_address}"
352353

353354
devnull:

install/ubuntu/13.04/exim/exim4.conf.template

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,8 @@ userautoreply:
347347
driver = autoreply
348348
file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg
349349
from = "${local_part}@${domain}"
350-
subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}"
350+
headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit
351+
subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}"
351352
to = "${sender_address}"
352353

353354
devnull:

install/ubuntu/13.10/exim/exim4.conf.template

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,8 @@ userautoreply:
347347
driver = autoreply
348348
file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg
349349
from = "${local_part}@${domain}"
350-
subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}"
350+
headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit
351+
subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}"
351352
to = "${sender_address}"
352353

353354
devnull:

install/ubuntu/14.04/exim/exim4.conf.template

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,8 @@ userautoreply:
347347
driver = autoreply
348348
file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg
349349
from = "${local_part}@${domain}"
350-
subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}"
350+
headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit
351+
subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}"
351352
to = "${sender_address}"
352353

353354
devnull:

0 commit comments

Comments
 (0)