diff options
author | Joey Hess <joeyh@joeyh.name> | 2015-04-09 13:02:57 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2015-04-09 13:02:57 -0400 |
commit | 7166fa150bbe98079e707ee9916434bd7e0affcc (patch) | |
tree | 7861e1b5527d830fc972b51921b34ea1a152252c /Command | |
parent | a67cf42a599146acee0401525ccdc7cbe3211ad9 (diff) |
importfeed: Fix feed download when curl is used.
This bug used to only afflict file:/// urls, but became more exposed
by b1483ee577dded9e00f8d82d52a806ee02888b2c.
Diffstat (limited to 'Command')
-rw-r--r-- | Command/ImportFeed.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/ImportFeed.hs b/Command/ImportFeed.hs index b60627cfe..ed3c3bcd3 100644 --- a/Command/ImportFeed.hs +++ b/Command/ImportFeed.hs @@ -150,9 +150,9 @@ downloadFeed url = do showOutput uo <- Url.getUrlOptions liftIO $ withTmpFile "feed" $ \f h -> do - fileEncoding h + hClose h ifM (Url.download url f uo) - ( parseFeedString <$> hGetContentsStrict h + ( parseFeedString <$> readFileStrictAnyEncoding f , return Nothing ) |