diff options
| author | Simon McVittie <smcv@debian.org> | 2019-02-10 17:22:06 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2019-02-26 22:21:27 +0000 |
| commit | d283e4ca1aeb6ca8cc0951c8495f778071076013 (patch) | |
| tree | c6e10b583199d2157242b4bc31b22fb2c4ac210d /IkiWiki/Plugin/aggregate.pm | |
| parent | 67543ce1d62161fdef9dca198289d7dd7dceacc0 (diff) | |
| download | ikiwiki-d283e4ca1aeb6ca8cc0951c8495f778071076013.tar ikiwiki-d283e4ca1aeb6ca8cc0951c8495f778071076013.tar.gz | |
useragent: Automatically choose whether to use LWPx::ParanoidAgent
The simple implementation of this, which I'd prefer to use, would be:
if we can import LWPx::ParanoidAgent, use it; otherwise, use
LWP::UserAgent.
However, aggregate has historically worked with proxies, and
LWPx::ParanoidAgent quite reasonably refuses to work with proxies
(because it can't know whether those proxies are going to do the same
filtering that LWPx::ParanoidAgent would).
Signed-off-by: Simon McVittie <smcv@debian.org>
Diffstat (limited to 'IkiWiki/Plugin/aggregate.pm')
| -rw-r--r-- | IkiWiki/Plugin/aggregate.pm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index 05e22a290..8f0870e2e 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -513,7 +513,10 @@ sub aggregate (@) { } $feed->{feedurl}=pop @urls; } - my $ua=useragent(); + # Using the for_url parameter makes sure we crash if used + # with an older IkiWiki.pm that didn't automatically try + # to use LWPx::ParanoidAgent. + my $ua=useragent(for_url => $feed->{feedurl}); my $res=URI::Fetch->fetch($feed->{feedurl}, UserAgent=>$ua); if (! $res) { $feed->{message}=URI::Fetch->errstr; |