- From: Ville Skytta via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 21 Apr 2008 07:26:35 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/perl/modules/W3C/LinkChecker/bin In directory hutz:/tmp/cvs-serv4704/bin Modified Files: checklink Log Message: Require libwww-perl >= 5.802. Index: checklink =================================================================== RCS file: /sources/public/perl/modules/W3C/LinkChecker/bin/checklink,v retrieving revision 4.99 retrieving revision 4.100 diff -u -d -r4.99 -r4.100 --- checklink 21 Apr 2008 07:09:53 -0000 4.99 +++ checklink 21 Apr 2008 07:26:33 -0000 4.100 @@ -181,7 +181,7 @@ use HTML::Entities qw(); use HTML::Parser 3.20 qw(); # >= 3.20 for "line" argspec identifier use HTTP::Request qw(); -use HTTP::Response qw(); +use HTTP::Response 1.50 qw(); # >= 1.50 for decoded_content() use Time::HiRes qw(); use URI qw(); use URI::Escape qw(); @@ -1092,20 +1092,18 @@ $failed_reason = "Content-Type for <$request_uri> is " . (defined($ct) ? "'$ct'" : 'undefined'); } else { - if ($response->can('decoded_content')) { # LWP >= 5.802 - # Pre-decode Content-Encoding. - # @@@TODO: maybe also decode charsets? - my $docref = $response->decoded_content(ref => 1, charset => 'none'); - if (defined($docref)) { - $response->content_ref($docref); - # Remove Content-Encoding so it won't be decoded again later. - $response->remove_header('Content-Encoding') - } else { - my $ce = $response->header('Content-Encoding'); - $ce = defined($ce) ? "'$ce'" : 'undefined'; - $ct = defined($ct) ? "'$ct'" : 'undefined'; - $failed_reason = "Error decoding document at <$request_uri>, Content-Type $ct, Content-Encoding $ce: '$@'"; - } + # Pre-decode Content-Encoding. + # @@@TODO: maybe also decode charsets? + my $docref = $response->decoded_content(ref => 1, charset => 'none'); + if (defined($docref)) { + $response->content_ref($docref); + # Remove Content-Encoding so it won't be decoded again later. + $response->remove_header('Content-Encoding') + } else { + my $ce = $response->header('Content-Encoding'); + $ce = defined($ce) ? "'$ce'" : 'undefined'; + $ct = defined($ct) ? "'$ct'" : 'undefined'; + $failed_reason = "Error decoding document at <$request_uri>, Content-Type $ct, Content-Encoding $ce: '$@'"; } } if ($failed_reason) {
Received on Monday, 21 April 2008 07:27:08 UTC