From 8f20c7909636b01e1511f0a0e0e9f8b29f90f91e Mon Sep 17 00:00:00 2001
From: Marcus Comstedt <marcus@mc.pp.se>
Date: Mon, 15 Sep 1997 13:31:05 +0200
Subject: [PATCH] Don't try to decode multipart/* if no body given...
Rev: src/modules/MIME/module.pmod.in:1.7
---
src/modules/MIME/module.pmod.in | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/modules/MIME/module.pmod.in b/src/modules/MIME/module.pmod.in
index 51d8001543..0fde21e3cf 100644
--- a/src/modules/MIME/module.pmod.in
+++ b/src/modules/MIME/module.pmod.in
@@ -1,5 +1,5 @@
/*
- * $Id: module.pmod.in,v 1.6 1997/08/23 23:04:03 marcus Exp $
+ * $Id: module.pmod.in,v 1.7 1997/09/15 11:31:05 marcus Exp $
*
* RFC1521 functionality for Pike
*
@@ -306,12 +306,7 @@ class Message {
disposition = 0;
if (hdrs || parts) {
string hname;
- if (message)
- decoded_data = message;
- else
- decoded_data = (parts?
- "This is a multi-part message in MIME format.\r\n":
- "");
+ decoded_data = message;
if (hdrs)
foreach( indices(hdrs), hname )
headers[lower_case(hname)] = hdrs[hname];
@@ -376,6 +371,11 @@ class Message {
return object_program(this_object())(part[1..]);
});
}
+ if((hdrs || parts) && !decoded_data) {
+ decoded_data = (parts?
+ "This is a multi-part message in MIME format.\r\n":
+ "");
+ }
}
}
--
GitLab