From 3c21f499a99d3459e7d2671588ca7ecbe044fa27 Mon Sep 17 00:00:00 2001
From: pdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Thu, 2 Apr 2009 00:39:15 +0000
Subject: [PATCH] Default Content-Transfer-Encoding is now RFC-compliant "7bit"
 instead of "us-ascii". (#1942060)

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@13501 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 class/mime/Message.class.php | 2 +-
 src/download.php             | 2 +-
 src/read_body.php            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/class/mime/Message.class.php b/class/mime/Message.class.php
index e19b2e9d..1578b8eb 100644
--- a/class/mime/Message.class.php
+++ b/class/mime/Message.class.php
@@ -357,7 +357,7 @@ class Message {
                                 $hdr = new MessageHeader();
                                 $hdr->type0 = 'text';
                                 $hdr->type1 = 'plain';
-                                $hdr->encoding = 'us-ascii';
+                                $hdr->encoding = '7bit';
                             } else {
                                 $msg->header->type0 = 'multipart';
                                 $msg->type0 = 'multipart';
diff --git a/src/download.php b/src/download.php
index 65a56dd8..1718a862 100644
--- a/src/download.php
+++ b/src/download.php
@@ -87,7 +87,7 @@ if ($ent_id) {
     /* raw message */
     $type0 = 'message';
     $type1 = 'rfc822';
-    $encoding = 'US-ASCII';
+    $encoding = '7bit';
     $header = $message->header;
 }
 
diff --git a/src/read_body.php b/src/read_body.php
index 1e8646a7..3b5ead8b 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -206,7 +206,7 @@ function SendMDN ( $mailbox, $passed_id, $message, $imapConnection) {
     if ($special_encoding) {
         $mime_header->encoding = $special_encoding;
     } else {
-        $mime_header->encoding = 'us-ascii';
+        $mime_header->encoding = '7bit';
     }
     if ($default_charset) {
         $mime_header->parameters['charset'] = $default_charset;
@@ -230,7 +230,7 @@ function SendMDN ( $mailbox, $passed_id, $message, $imapConnection) {
     $mime_header = new MessageHeader;
     $mime_header->type0 = 'message';
     $mime_header->type1 = 'disposition-notification';
-    $mime_header->encoding = 'us-ascii';
+    $mime_header->encoding = '7bit';
     $part2->mime_header = $mime_header;
 
     $composeMessage = new Message();
-- 
2.25.1