summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--lib/feed2imap/httpfetcher.rb2
-rw-r--r--lib/feed2imap/imap.rb4
-rw-r--r--lib/feed2imap/itemtomail.rb3
4 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b836cc..d5df189 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@ Feed2Imap 0.7 (XX/02/2006)
============================
* Fixes the IMAPS disconnection problem (patch provided by Gael Utard
<gael.utard@laposte.net>)
+* Fixes some issues regarding parallel fetching of feeds.
+* Now displays the feed creator as sender of emails.
+* Don't display the password in error messages (fixes debian bug #350370).
Feed2Imap 0.6 (11/01/2006)
============================
diff --git a/lib/feed2imap/httpfetcher.rb b/lib/feed2imap/httpfetcher.rb
index 1d82b53..a548b16 100644
--- a/lib/feed2imap/httpfetcher.rb
+++ b/lib/feed2imap/httpfetcher.rb
@@ -29,7 +29,7 @@ require 'uri'
# max number of redirections
MAXREDIR = 5
-HTTPDEBUG = true
+HTTPDEBUG = false
# Class used to retrieve the feed over HTTP
class HTTPFetcher
diff --git a/lib/feed2imap/imap.rb b/lib/feed2imap/imap.rb
index 6957489..ca81a9f 100644
--- a/lib/feed2imap/imap.rb
+++ b/lib/feed2imap/imap.rb
@@ -114,7 +114,9 @@ class ImapAccount
# convert to string
def to_s
- uri.to_s
+ u2 = uri.clone
+ u2.password = nil
+ u2.to_s
end
# remove mails in a folder according to a criteria
diff --git a/lib/feed2imap/itemtomail.rb b/lib/feed2imap/itemtomail.rb
index f2c5616..20fdd12 100644
--- a/lib/feed2imap/itemtomail.rb
+++ b/lib/feed2imap/itemtomail.rb
@@ -50,8 +50,9 @@ def item_to_mail(item, index, updated, from = 'Feed2Imap')
message.header['From'] = "#{item.creator.chomp} <feed2imap@acme.com>"
end
else
- message.header['To'] = "#{from} <feed2imap@acme.com>"
+ message.header['From'] = "#{from} <feed2imap@acme.com>"
end
+ message.header['To'] = "#{from} <feed2imap@acme.com>"
if @date.nil?
message.header['Date'] = Time::new.rfc2822
else