summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--data/doc/feed2imap/examples/feed2imaprc13
-rw-r--r--lib/feed2imap/itemtomail.rb13
3 files changed, 16 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 0879abc..a9d131b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ Feed2Imap 0.8 (XX/XX/2006)
* When disconnecting from the IMAP server, don't display an exception in
non-verbose mode if the "connection is reset by peer" (fixes Debian bug
#367282).
+* Handling of exceptions in needMIME (fixes gna bug #5872).
Feed2Imap 0.7 (17/02/2006)
============================
diff --git a/data/doc/feed2imap/examples/feed2imaprc b/data/doc/feed2imap/examples/feed2imaprc
index 602e68b..eee49f3 100644
--- a/data/doc/feed2imap/examples/feed2imaprc
+++ b/data/doc/feed2imap/examples/feed2imaprc
@@ -22,15 +22,14 @@
feeds:
- name: feed2imap
url: http://home.gna.org/feed2imap/feed2imap.rss
- target: imap://lucaswebmail:password@imap.apinc.org/INBOX.Feeds.Feed2Imap
+ target: imap://luser:password@imap.apinc.org/INBOX.Feeds.Feed2Imap
- name: lucas
- url: http://www.lucas-nussbaum.net/dotclear/rss.php
- target: imap://lucaswebmail:password@imap.apinc.org/INBOX.Feeds.Lucas
+ url: http://www.lucas-nussbaum.net/blog/?feed=rss2
+ target: imap://luser:password@imap.apinc.org/INBOX.Feeds.Lucas
- name: linuxfr
url: http://linuxfr.org/backend/news/rss20.rss
- target: imap://lucaswebmail:password@imap.apinc.org/INBOX.Feeds.LinuxFR
- -
- name: JabberFrWiki
+ target: imap://luser:password@imap.apinc.org/INBOX.Feeds.LinuxFR
+ - name: JabberFrWiki
url: http://wiki.jabberfr.org/index.php?title=Special:Recentchanges&feed=rss
- target: imaps://lucaswebmail:password@imap.apinc.org/INBOX.Feeds.JabberFR
+ target: imaps://luser:password@imap.apinc.org/INBOX.Feeds.JabberFR
always-new: true
diff --git a/lib/feed2imap/itemtomail.rb b/lib/feed2imap/itemtomail.rb
index 3a552d6..755a436 100644
--- a/lib/feed2imap/itemtomail.rb
+++ b/lib/feed2imap/itemtomail.rb
@@ -31,11 +31,16 @@ require 'feed2imap/rubymail_patch'
class String
def needMIME
utf8 = false
- self.unpack('U*').each do |c|
- if c > 127
- utf8 = true
- break
+ begin
+ self.unpack('U*').each do |c|
+ if c > 127
+ utf8 = true
+ break
+ end
end
+ rescue
+ # safe fallback in case of problems
+ utf8 = true
end
utf8
end