Changeset 2779

Timestamp:

2001-10-04T11:41:16+12:00 (23 years ago)

Author:

jrm21

Message:

Be a little more flexible when looking for boundary field in a content-type
header field, as there may be extra stuff in there.

File:

• trunk/gsdl/perllib/plugins/EMAILPlug.pm (modified) (3 diffs)

trunk/gsdl/perllib/plugins/EMAILPlug.pm

@@ -132 +132 @@
     $Headers =~ s/\r?\n\r?\n(.*)$//s;
     $$textref = $1;
+    
+    # See if headers include non-ascii - RFC says whole header should be ascii.
+# not yet implemented, as we don't know what character set is the
+# user's default... We can do textcat to guess, or we can just choose
+# one of the charset fields later in the document (if there are any...)
+#    if ($Headers =~ /([[:^ascii:]])/) {
+#    }
 
     # Unfold headers - see rfc822
@@ -465 +472 @@
             $part_content_type="message/rfc822";
         }
-        if ($part_header =~ m@^content\-type:\s*([\w+/\-]+)\s*\;?\s*([^\s]*)@mi) {
+        if ($part_header =~ m@^content\-type:\s*([\w+/\-]+)\s*\;?\s*(.*?)\s*@mi) {
             $part_content_type=$1; $part_content_type =~ tr/A-Z/a-z/;
             $part_content_info=$2;
@@ -508 +515 @@
             my $rfc822_formatted_body=""; # put result in here
             if ($message_part_headers =~
-            /^content\-type:\s*([\w\/\-]+)\s*\;?\s*?([^\s]+)?\s*$/ims)
+            /^content\-type:\s*([\w\/\-]+)\s*\;?\s*(.*?)\s*$/ims)
             {
             # The message header uses MIME flags