You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by se...@apache.org on 2016/12/12 01:51:35 UTC
incubator-ponymail git commit: does not handle text/enriched mails
Repository: incubator-ponymail
Updated Branches:
refs/heads/master fed2cdb10 -> bbf31ec1b
does not handle text/enriched mails
This fixes #289
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/bbf31ec1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/bbf31ec1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/bbf31ec1
Branch: refs/heads/master
Commit: bbf31ec1b47555e0efe29f369cfb7f34048094f0
Parents: fed2cdb
Author: Sebb <se...@apache.org>
Authored: Mon Dec 12 01:51:25 2016 +0000
Committer: Sebb <se...@apache.org>
Committed: Mon Dec 12 01:51:25 2016 +0000
----------------------------------------------------------------------
CHANGELOG.md | 1 +
test/resources/pass/text-enriched.mbox | 87 +++++++++++++++++++++++++++++
tools/archiver.py | 2 +
3 files changed, 90 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/bbf31ec1/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c8c1db..1ee4a79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,6 +58,7 @@
- ponymail.js/formatDate may show the wrong timezone (#285)
- archiver.py fails when attachment name is not ASCII (#287)
- emails with no body content are ignored (#109)
+- does not handle text/enriched mails (#289)
## CHANGES in 0.9b:
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/bbf31ec1/test/resources/pass/text-enriched.mbox
----------------------------------------------------------------------
diff --git a/test/resources/pass/text-enriched.mbox b/test/resources/pass/text-enriched.mbox
new file mode 100644
index 0000000..cb4b797
--- /dev/null
+++ b/test/resources/pass/text-enriched.mbox
@@ -0,0 +1,87 @@
+From tomcat-user-return-34660-apmail-jakarta-tomcat-user-archive=jakarta.apache.org@jakarta.apache.org Mon May 14 19:23:38 2001
+Return-Path: <to...@jakarta.apache.org>
+Delivered-To: apmail-jakarta-tomcat-user-archive@jakarta.apache.org
+Received: (qmail 71623 invoked by uid 500); 14 May 2001 19:23:25 -0000
+Mailing-List: contact tomcat-user-help@jakarta.apache.org; run by ezmlm
+Precedence: bulk
+Reply-To: tomcat-user@jakarta.apache.org
+list-help: <ma...@jakarta.apache.org>
+list-unsubscribe: <ma...@jakarta.apache.org>
+list-post: <ma...@jakarta.apache.org>
+List-Id: <tomcat-user.jakarta.apache.org>
+Delivered-To: mailing list tomcat-user@jakarta.apache.org
+Received: (qmail 71599 invoked from network); 14 May 2001 19:23:07 -0000
+Received: from netgate.emmes.com (root@208.208.19.150)
+ by h31.sny.collab.net with SMTP; 14 May 2001 19:23:07 -0000
+Received: from kumar ([10.0.0.229])
+ by netgate.emmes.com (8.9.3/8.9.3) with SMTP id OAA09624
+ for <to...@jakarta.apache.org>; Mon, 14 May 2001 14:58:19 -0400
+Message-Id: <3....@netgate.emmes.com>
+X-Sender: kumar@netgate.emmes.com
+X-Mailer: QUALCOMM Windows Eudora Pro Version 3.0.5 (32)
+Date: Mon, 14 May 2001 15:23:21 -0400
+To: tomcat-user@jakarta.apache.org
+From: Kumar Thotapally <kt...@emmes.com>
+Subject: Virtual Hosts
+Mime-Version: 1.0
+Content-Type: text/enriched; charset="us-ascii"
+X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N
+
+Hi,
+
+
+I am able to startup and shutdown multiple JVMs (using server1.xml ...
+etc). I created applications (for example, JVM1, JVM2) under web-apps.
+
+
+When I enter http://localhost:8007/jvm1/servlet/HelloWorld1 in my
+browser,
+
+it works fine.
+
+
+However, with the following code in server1.xml :
+
+
+<fontfamily><param>Courier New</param><bigger> <<ContextManager
+debug="0" workDir="work_jvm1" showDebugInfo="true" >
+
+</bigger></fontfamily>
+
+followed by
+
+<fontfamily><param>Courier New</param><bigger> <<!-- @@@ the /jvm1
+context -->
+
+
+ <<Host name="www.tomcat1.com" >
+
+ <<Context path="/jvm1"
+
+ docBase="webapps/jvm1"
+
+ crossContext="false"
+
+</bigger></fontfamily><fontfamily><param>Courier New</param><bigger>
+debug="1"
+
+ reloadable="true" >
+
+ <</Context>
+
+ <</Host>
+
+</bigger></fontfamily>along with other contexts.
+
+
+When I enter www.tomcat1.com, I am not able to get the result.
+
+
+Any suggestions?
+
+
+Thanks,
+
+
+Kumar.
+
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/bbf31ec1/tools/archiver.py
----------------------------------------------------------------------
diff --git a/tools/archiver.py b/tools/archiver.py
index e71d7a6..968ebee 100755
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -208,6 +208,8 @@ class Archiver(object):
print(err)
elif msg.get_content_type() == 'text/plain':
body = msg.get_payload(decode=True)
+ elif msg.get_content_type() == 'text/enriched':
+ body = msg.get_payload(decode=True)
elif msg.get_content_type() == 'text/html' and self.html and not firstHTML:
firstHTML = msg.get_payload(decode=True)