Hello community, here is the log from the commit of package perl-libwww-perl for openSUSE:Factory checked in at 2015-04-25 16:46:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-libwww-perl (Old) and /work/SRC/openSUSE:Factory/.perl-libwww-perl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-libwww-perl" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-libwww-perl/perl-libwww-perl.changes 2013-07-18 17:32:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-libwww-perl.new/perl-libwww-perl.changes 2015-04-25 16:46:34.000000000 +0200 @@ -1,0 +2,127 @@ +Wed Apr 22 14:04:33 UTC 2015 - [email protected] + +- disable disable-ghttp.diff + +------------------------------------------------------------------- +Wed Apr 22 14:03:40 UTC 2015 - [email protected] + +- updated to 6.13 + see /usr/share/doc/packages/perl-libwww-perl/Changes + + 2015-02-14 Release 6.13 + + Karen Etheridge (1): + - fixed Makefile.PL compatibility with older ExtUtils::MakeMaker (from + release 6.12) + + _______________________________________________________________________________ + 2015-02-13 Release 6.12 + + Karen Etheridge (1): + - fixed prereq declarations in release 6.11 + + _______________________________________________________________________________ + 2015-02-13 Release 6.11 + + Graham Knop (1): + - cleanup of the test running mechanism; allowing greater flexibility and + should also resolve RT#102083 + + _______________________________________________________________________________ + 2015-02-12 Release 6.10 + + Karen Etheridge (1): + - lower runtime prereqs recommendation on LWP::Protocol::https to suggests, + to work around a circular dependency in CPAN clients when the 'install + recommendations' option is enabled (RT#101732) + + _______________________________________________________________________________ + 2015-02-09 Release 6.09 + + Steffen Ullrich (1): + - checks for EINTR now also check EWOULDBLOCK (they sometimes differ on + MSWin32) + + Daina Pettit (1): + - fixed pod syntax + + Jason A Fesler (2): + - Fixed checking the % character in address regex + - Improved regex for literal IPv6 addresses + + _______________________________________________________________________________ + 2014-07-24 Release 6.08 + + Mike Schilli (1): + Requiring Net::HTTP 6.07 to fix IPv6 support + (RT#75618 and https://github.com/libwww-perl/net-http/pull/10) + + Jason A Fesler (2): + When the hostname is an IPv6 literal, encapsulate it with [brackets] + before calling Net::HTTP [rt.cpan.org #29468] + Extra steps to make sure that the host address that has a ":" contains + only characters appropriate for an IPv6 address. + + John Wittkoski (1): + Fix doc typo for cookie_jar + + _______________________________________________________________________________ + 2014-07-01 Release 6.07 + + Mike Schilli (5): + Removed Data::Dump references in test suite and dependency in Makefile.PL + Added MANIFEST.SKIP to enable "make manifest". + release script now checks for MacOS to avoid incompatible tarballs + Bumped version number to 6.07 + Fixed gnu-incompatible tarball problem ([rt.cpan.org #94844]) + + _______________________________________________________________________________ + 2014-04-16 Release 6.06 + + Ville Skyttä (3): + Merge pull request #44 from dsteinbrunner/master + Spelling fixes. + Merge pull request #55 from oalders/master + + Karen Etheridge (2): + Merge pull request #38 from mbeijen/typo-sting + Merge pull request #43 from dsteinbrunner/master + + David Steinbrunner (2): + Spelling corrections + + Olaf Alders (1): + Typo fixes. + + Steffen Ullrich (1): + correct behavior for https_proxy, + e.g. don't send plain https:// requests to proxy, but instead establish + CONNECT tunnel and then send requests inside tunnel. + This change does together with a change in LWP::Protocol::https. + The change supports LWP::Protocol::https with the default + IO::Socket::SSL backend, but also with Net::SSL. Also: + - proxy authorization is supported (http://user:pass@host:port as proxy + URL, Net::SSL still needs special HTTPS_PROXY_* environemt variables, + as before) + - CONNECT request does not need to be the first request inside the + tunnel (not with Net::SSL) + - conn_cache is read and written inside request(), instead of writing in + request() and reading in _new_socket(). If a https tunnel is + established the cache_key no longer depends only on proxy host,port + but also on the tunnel endpoint + - CONNECT is a proxy request and must always use Proxy-Authorization, + not Authorization header + + turugina (1): + fix: auth-header of Digest auth did not conform to + RFC 2617 when WWW-Authenticate has 'qop' parameter. + + Gisle Aas (1): + SSL libs might trigger ENOTTY on read + + Michiel Beijen (1): + Small typo. + + _______________________________________________________________________________ + +------------------------------------------------------------------- Old: ---- disable-ghttp.diff libwww-perl-6.05.tar.gz New: ---- cpanspec.yml libwww-perl-6.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-libwww-perl.spec ++++++ --- /var/tmp/diff_new_pack.fttcxb/_old 2015-04-25 16:46:34.000000000 +0200 +++ /var/tmp/diff_new_pack.fttcxb/_new 2015-04-25 16:46:34.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-libwww-perl # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,20 +17,19 @@ Name: perl-libwww-perl -Version: 6.05 +Version: 6.13 Release: 0 %define cpan_name libwww-perl -Summary: The World-Wide-Web library for Perl -License: GPL-1.0+ or Artistic-1.0 +Summary: The World-Wide Web library for Perl +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/libwww-perl/ -Source: http://www.cpan.org/authors/id/G/GA/GAAS/libwww-perl-%{version}.tar.gz -# PATCH-FIX-OPENSUSE -- disable one perl requires that would be created automatically and we're unable to provide -Patch0: disable-ghttp.diff +Source0: libwww-perl-6.13.tar.gz +Source1: cpanspec.yml +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(Digest::MD5) -BuildRequires: perl(Encode) >= 2.12 BuildRequires: perl(Encode::Locale) BuildRequires: perl(File::Listing) >= 6 BuildRequires: perl(HTML::Entities) @@ -44,11 +43,10 @@ BuildRequires: perl(HTTP::Response) >= 6 BuildRequires: perl(HTTP::Status) >= 6 BuildRequires: perl(LWP::MediaTypes) >= 6 -BuildRequires: perl(Net::HTTP) >= 6.04 +BuildRequires: perl(Net::HTTP) >= 6.07 BuildRequires: perl(URI) >= 1.10 BuildRequires: perl(URI::Escape) BuildRequires: perl(WWW::RobotRules) >= 6 -# Requires: perl(Encode::Locale) Requires: perl(File::Listing) >= 6 Requires: perl(HTML::Entities) @@ -62,30 +60,20 @@ Requires: perl(HTTP::Response) >= 6 Requires: perl(HTTP::Status) >= 6 Requires: perl(LWP::MediaTypes) >= 6 -Requires: perl(Net::HTTP) >= 6.04 +Requires: perl(Net::HTTP) >= 6.07 Requires: perl(URI) >= 1.10 Requires: perl(URI::Escape) Requires: perl(WWW::RobotRules) >= 6 -# -Recommends: perl(Authen::NTML) >= 2.12 -Recommends: perl(Data::Dump) -Recommends: perl(IO::Socket::SSL) >= 1.38 -Recommends: perl(LWP::Protocol::https) >= 6.02 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch %{perl_requires} +# MANUAL BEGIN +Recommends: perl(LWP::Protocol::https) >= 6.06 +# MANUAL END %description -The libwww-perl collection is a set of Perl modules which provides a -simple and consistent application programming interface to the -World-Wide Web. The main focus of the library is to provide classes -and functions that allow you to write WWW clients. The library also -contain modules that are of more general use and even classes that -help you implement simple HTTP servers. +The World-Wide Web library for Perl %prep %setup -q -n %{cpan_name}-%{version} -%patch0 -p1 find . -type f -print0 | xargs -0 chmod 644 %build @@ -103,6 +91,5 @@ %files -f %{name}.files %defattr(-,root,root,755) %doc AUTHORS Changes README README.SSL talk-to-ourself -%attr(755,root,root) %{_bindir}/* %changelog ++++++ cpanspec.yml ++++++ --- #description_paragraphs: 3 #no_testing: broken upstream #sources: # - source1 # - source2 #patches: # foo.patch: -p1 # bar.patch: preamble: |- Recommends: perl(LWP::Protocol::https) >= 6.06 # BuildRequires: gcc-c++ #post_prep: |- # hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'` # sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL #post_install: |- # sed on %{name}.files #license: SUSE-NonFree #skip_noarch: 1 #custom_build: - #./Build build flags=%{?_smp_mflags} --myflag #ignore_requires: Bizarre::Module ++++++ libwww-perl-6.05.tar.gz -> libwww-perl-6.13.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/Changes new/libwww-perl-6.13/Changes --- old/libwww-perl-6.05/Changes 2013-03-11 22:42:44.000000000 +0100 +++ new/libwww-perl-6.13/Changes 2015-02-14 19:38:19.000000000 +0100 @@ -1,4 +1,119 @@ _______________________________________________________________________________ +2015-02-14 Release 6.13 + +Karen Etheridge (1): + - fixed Makefile.PL compatibility with older ExtUtils::MakeMaker (from + release 6.12) + +_______________________________________________________________________________ +2015-02-13 Release 6.12 + +Karen Etheridge (1): + - fixed prereq declarations in release 6.11 + +_______________________________________________________________________________ +2015-02-13 Release 6.11 + +Graham Knop (1): + - cleanup of the test running mechanism; allowing greater flexibility and + should also resolve RT#102083 + +_______________________________________________________________________________ +2015-02-12 Release 6.10 + +Karen Etheridge (1): + - lower runtime prereqs recommendation on LWP::Protocol::https to suggests, + to work around a circular dependency in CPAN clients when the 'install + recommendations' option is enabled (RT#101732) + +_______________________________________________________________________________ +2015-02-09 Release 6.09 + +Steffen Ullrich (1): + - checks for EINTR now also check EWOULDBLOCK (they sometimes differ on + MSWin32) + +Daina Pettit (1): + - fixed pod syntax + +Jason A Fesler (2): + - Fixed checking the % character in address regex + - Improved regex for literal IPv6 addresses + +_______________________________________________________________________________ +2014-07-24 Release 6.08 + +Mike Schilli (1): + Requiring Net::HTTP 6.07 to fix IPv6 support + (RT#75618 and https://github.com/libwww-perl/net-http/pull/10) + +Jason A Fesler (2): + When the hostname is an IPv6 literal, encapsulate it with [brackets] + before calling Net::HTTP [rt.cpan.org #29468] + Extra steps to make sure that the host address that has a ":" contains + only characters appropriate for an IPv6 address. + +John Wittkoski (1): + Fix doc typo for cookie_jar + +_______________________________________________________________________________ +2014-07-01 Release 6.07 + +Mike Schilli (5): + Removed Data::Dump references in test suite and dependency in Makefile.PL + Added MANIFEST.SKIP to enable "make manifest". + release script now checks for MacOS to avoid incompatible tarballs + Bumped version number to 6.07 + Fixed gnu-incompatible tarball problem ([rt.cpan.org #94844]) + +_______________________________________________________________________________ +2014-04-16 Release 6.06 + +Ville Skyttä (3): + Merge pull request #44 from dsteinbrunner/master + Spelling fixes. + Merge pull request #55 from oalders/master + +Karen Etheridge (2): + Merge pull request #38 from mbeijen/typo-sting + Merge pull request #43 from dsteinbrunner/master + +David Steinbrunner (2): + Spelling corrections + +Olaf Alders (1): + Typo fixes. + +Steffen Ullrich (1): + correct behavior for https_proxy, + e.g. don't send plain https:// requests to proxy, but instead establish + CONNECT tunnel and then send requests inside tunnel. + This change does together with a change in LWP::Protocol::https. + The change supports LWP::Protocol::https with the default + IO::Socket::SSL backend, but also with Net::SSL. Also: + - proxy authorization is supported (http://user:pass@host:port as proxy + URL, Net::SSL still needs special HTTPS_PROXY_* environemt variables, + as before) + - CONNECT request does not need to be the first request inside the + tunnel (not with Net::SSL) + - conn_cache is read and written inside request(), instead of writing in + request() and reading in _new_socket(). If a https tunnel is + established the cache_key no longer depends only on proxy host,port + but also on the tunnel endpoint + - CONNECT is a proxy request and must always use Proxy-Authorization, + not Authorization header + +turugina (1): + fix: auth-header of Digest auth did not conform to + RFC 2617 when WWW-Authenticate has 'qop' parameter. + +Gisle Aas (1): + SSL libs might trigger ENOTTY on read + +Michiel Beijen (1): + Small typo. + +_______________________________________________________________________________ 2013-03-11 Release 6.05 Karen Etheridge (3): @@ -1793,12 +1908,12 @@ it that it takes effect if associated with the $ua. The handling of $ua->max_size changed to make 0 mean 0 - (not unlimited). An value of undef means no limit. + (not unlimited). A value of undef means no limit. The X-Content-Base header is gone. I hope nobody relies on it. It might come back if people start to scream. There is a new Client-Aborted header instead. - The Range header generated for $ua->max_size had a off-by-one + The Range header generated for $ua->max_size had an off-by-one error. A range of "0-1" means 2 bytes. The LWP::UserAgent constructor now takes configuration arguments. @@ -3357,7 +3472,7 @@ o The construct "defined ref($arg)" did not work on perl5.002 because ref now always return something defined. - o LWP::UserAgent sends by default an 'User-Agent' header. + o LWP::UserAgent sends by default a 'User-Agent' header. o LWP::Simple sends 'User-Agent' header to servers. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/MANIFEST new/libwww-perl-6.13/MANIFEST --- old/libwww-perl-6.05/MANIFEST 2013-03-11 22:45:34.000000000 +0100 +++ new/libwww-perl-6.13/MANIFEST 2015-02-14 19:44:00.000000000 +0100 @@ -1,14 +1,9 @@ AUTHORS Who made this -Changes History of this package -MANIFEST This file -Makefile.PL Makefile generator -README Get you started with this package -README.SSL When you need SSL support -bin/lwp-download Writes bin/lwp-download script +bin/lwp-download Writes bin/lwp-download script bin/lwp-dump Writes bin/lwp-dump script bin/lwp-mirror Writes bin/lwp-mirror script bin/lwp-request Writes bin/lwp-request script -talk-to-ourself Are we able to run tests talk HTTP to local server? +Changes History of this package lib/LWP.pm Includes what you need lib/LWP/Authen/Basic.pm Basic authentication scheme lib/LWP/Authen/Digest.pm Digest authentication scheme @@ -18,14 +13,14 @@ lib/LWP/DebugFile.pm Send debug output to a file lib/LWP/MemberMixin.pm Helps you access %$self lib/LWP/Protocol.pm Virtual base class for LWP protocols -lib/LWP/Protocol/GHTTP.pm Alternative HTTP protocol handler lib/LWP/Protocol/cpan.pm Access to cpan URLs -lib/LWP/Protocol/data.pm Access to data URLs +lib/LWP/Protocol/data.pm Access to data URLs lib/LWP/Protocol/file.pm Access local files lib/LWP/Protocol/ftp.pm Access with the FTP protocol +lib/LWP/Protocol/GHTTP.pm Alternative HTTP protocol handler lib/LWP/Protocol/gopher.pm Access with the Gopher protocol lib/LWP/Protocol/http.pm Access with HTTP/1.1 protocol -lib/LWP/Protocol/loopback.pm Returns request (like HTTP TRACE) +lib/LWP/Protocol/loopback.pm Returns request (like HTTP TRACE) lib/LWP/Protocol/mailto.pm Allows you to POST mail using sendmail lib/LWP/Protocol/nntp.pm Handles access to news: and nntp: URLs lib/LWP/Protocol/nogo.pm Denies all requests. @@ -34,12 +29,14 @@ lib/LWP/UserAgent.pm A WWW UserAgent class lwpcook.pod Libwww-perl examples lwptut.pod Libwww-perl tutorial -t/README How to run and set up tests -t/TEST Run tests +Makefile.PL Makefile generator +MANIFEST This file +README Get you started with this package +README.SSL When you need SSL support t/base/protocols.t Test protocol methods of LWP::UserAgent +t/base/proxy.t t/base/ua.t Basic LWP::UserAgent tests t/live/apache-http10.t -t/live/online.t t/live/jigsaw/auth-b.t t/live/jigsaw/auth-d.t t/live/jigsaw/chunk.t @@ -48,11 +45,12 @@ t/live/jigsaw/neg-get.t t/live/jigsaw/neg.t t/live/jigsaw/te.t +t/live/online.t t/local/autoload-get.t t/local/autoload.t Test autoloading of LWP::Protocol modules t/local/get.t Try to get a local file t/local/http.t Test http to local server -t/local/protosub.t Test with other protocol module +t/local/protosub.t Test with other protocol module t/net/cgi-bin/moved t/net/cgi-bin/nph-slowdata t/net/cgi-bin/slowread @@ -67,4 +65,6 @@ t/net/proxy.t t/robot/ua-get.t t/robot/ua.t Test LWP::RobotUA -META.yml Module meta-data (added by MakeMaker) +talk-to-ourself Are we able to run tests talk HTTP to local server? +META.yml Module YAML meta-data (added by MakeMaker) +META.json Module JSON meta-data (added by MakeMaker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/META.json new/libwww-perl-6.13/META.json --- old/libwww-perl-6.05/META.json 1970-01-01 01:00:00.000000000 +0100 +++ new/libwww-perl-6.13/META.json 2015-02-14 19:44:00.000000000 +0100 @@ -0,0 +1,90 @@ +{ + "abstract" : "The World-Wide Web library for Perl", + "author" : [ + "Gisle Aas <[email protected]>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 7.0512, CPAN::Meta::Converter version 2.143240", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";, + "version" : "2" + }, + "name" : "libwww-perl", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : "0" + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "0" + } + }, + "runtime" : { + "requires" : { + "Digest::MD5" : "0", + "Encode" : "2.12", + "Encode::Locale" : "0", + "File::Listing" : "6", + "HTML::Entities" : "0", + "HTML::HeadParser" : "0", + "HTTP::Cookies" : "6", + "HTTP::Daemon" : "6", + "HTTP::Date" : "6", + "HTTP::Negotiate" : "6", + "HTTP::Request" : "6", + "HTTP::Request::Common" : "6", + "HTTP::Response" : "6", + "HTTP::Status" : "6", + "IO::Select" : "0", + "IO::Socket" : "0", + "LWP::MediaTypes" : "6", + "MIME::Base64" : "2.1", + "Net::FTP" : "2.58", + "Net::HTTP" : "6.07", + "URI" : "1.10", + "URI::Escape" : "0", + "WWW::RobotRules" : "6", + "perl" : "5.008001" + }, + "suggests" : { + "Authen::NTLM" : "1.02", + "HTTP::GHTTP" : "0", + "LWP::Protocol::https" : "6.02" + } + }, + "test" : { + "requires" : { + "FindBin" : "0", + "Test" : "0", + "Test::More" : "0" + } + } + }, + "release_status" : "stable", + "resources" : { + "bugtracker" : { + "mailto" : "[email protected]", + "web" : "https://rt.cpan.org/Public/Dist/Display.html?Name=libwww-perl"; + }, + "repository" : { + "type" : "git", + "url" : "https://github.com/libwww-perl/libwww-perl.git";, + "web" : "https://github.com/libwww-perl/libwww-perl"; + }, + "x_IRC" : "irc://irc.perl.org/#lwp", + "x_MailingList" : "mailto:[email protected]"; + }, + "version" : "6.13" +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/META.yml new/libwww-perl-6.13/META.yml --- old/libwww-perl-6.05/META.yml 2013-03-11 22:45:34.000000000 +0100 +++ new/libwww-perl-6.13/META.yml 2015-02-14 19:44:00.000000000 +0100 @@ -1,52 +1,54 @@ ---- #YAML:1.0 -name: libwww-perl -version: 6.05 -abstract: The World-Wide Web library for Perl +--- +abstract: 'The World-Wide Web library for Perl' author: - - Gisle Aas <[email protected]> -license: perl -distribution_type: module -configure_requires: - ExtUtils::MakeMaker: 0 + - 'Gisle Aas <[email protected]>' build_requires: - ExtUtils::MakeMaker: 0 + ExtUtils::MakeMaker: '0' + FindBin: '0' + Test: '0' + Test::More: '0' +configure_requires: + ExtUtils::MakeMaker: '0' +dynamic_config: 0 +generated_by: 'ExtUtils::MakeMaker version 7.0512, CPAN::Meta::Converter version 2.143240' +license: perl +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: '1.4' +name: libwww-perl +no_index: + directory: + - t + - inc requires: - Digest::MD5: 0 - Encode: 2.12 - Encode::Locale: 0 - File::Listing: 6 - HTML::Entities: 0 - HTML::HeadParser: 0 - HTTP::Cookies: 6 - HTTP::Daemon: 6 - HTTP::Date: 6 - HTTP::Negotiate: 6 - HTTP::Request: 6 - HTTP::Request::Common: 6 - HTTP::Response: 6 - HTTP::Status: 6 - IO::Select: 0 - IO::Socket: 0 - LWP::MediaTypes: 6 - MIME::Base64: 2.1 - Net::FTP: 2.58 - Net::HTTP: 6.04 - perl: 5.008001 - URI: 1.10 - URI::Escape: 0 - WWW::RobotRules: 6 + Digest::MD5: '0' + Encode: '2.12' + Encode::Locale: '0' + File::Listing: '6' + HTML::Entities: '0' + HTML::HeadParser: '0' + HTTP::Cookies: '6' + HTTP::Daemon: '6' + HTTP::Date: '6' + HTTP::Negotiate: '6' + HTTP::Request: '6' + HTTP::Request::Common: '6' + HTTP::Response: '6' + HTTP::Status: '6' + IO::Select: '0' + IO::Socket: '0' + LWP::MediaTypes: '6' + MIME::Base64: '2.1' + Net::FTP: '2.58' + Net::HTTP: '6.07' + URI: '1.10' + URI::Escape: '0' + WWW::RobotRules: '6' + perl: '5.008001' resources: - MailingList: mailto:[email protected] - repository: https://github.com/libwww-perl/libwww-perl -no_index: - directory: - - t - - inc -generated_by: ExtUtils::MakeMaker version 6.57_05 -meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 -recommends: - Authen::NTLM: 1.02 - Data::Dump: 0 - LWP::Protocol::https: 6.02 + IRC: irc://irc.perl.org/#lwp + MailingList: mailto:[email protected] + bugtracker: https://rt.cpan.org/Public/Dist/Display.html?Name=libwww-perl + repository: https://github.com/libwww-perl/libwww-perl.git +version: '6.13' + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/Makefile.PL new/libwww-perl-6.13/Makefile.PL --- old/libwww-perl-6.05/Makefile.PL 2013-01-02 20:47:46.000000000 +0100 +++ new/libwww-perl-6.13/Makefile.PL 2015-02-14 19:36:25.000000000 +0100 @@ -27,19 +27,20 @@ } } -system($^X, "talk-to-ourself"); -flag_file("t/CAN_TALK_TO_OURSELF", $? == 0); -flag_file("t/live/ENABLED", $opt{'live-tests'}); -flag_file("t/live/jigsaw/ENABLED", $opt{'jigsaw-tests'}); +my $tests = 't/base/*.t t/html/*.t t/robot/*.t t/local/*.t t/net/*.t'; +$tests .= ' t/live/*.t' + if $opt{'live-tests'}; +$tests .= ' t/live/jigsaw/*.t' + if $opt{'jigsaw-tests'}; -WriteMakefile( +my %WriteMakefileArgs = ( NAME => 'LWP', DISTNAME => 'libwww-perl', VERSION_FROM => 'lib/LWP.pm', ABSTRACT => 'The World-Wide Web library for Perl', AUTHOR => 'Gisle Aas <[email protected]>', EXE_FILES => [ map "bin/$_", @prog ], - LICENSE => "perl", + LICENSE => 'perl_5', MIN_PERL_VERSION => 5.008001, PREREQ_PM => { 'Digest::MD5' => 0, @@ -61,70 +62,77 @@ 'LWP::MediaTypes' => 6, 'MIME::Base64' => "2.1", 'Net::FTP' => "2.58", - 'Net::HTTP' => "6.04", + 'Net::HTTP' => "6.07", 'URI' => "1.10", 'URI::Escape' => 0, 'WWW::RobotRules' => 6, }, + TEST_REQUIRES => { + 'Test' => '0', + 'Test::More' => '0', + 'FindBin' => '0', + }, META_MERGE => { - recommends => { - 'LWP::Protocol::https' => '6.02', - 'Authen::NTLM' => "1.02", - 'Data::Dump' => 0, + 'meta-spec' => { version => 2 }, + dynamic_config => 0, + prereqs => { + runtime => { + suggests => { + 'LWP::Protocol::https' => '6.02', + 'Authen::NTLM' => "1.02", + 'HTTP::GHTTP' => '0', + }, + }, }, - resources => { - repository => 'https://github.com/libwww-perl/libwww-perl', - MailingList => 'mailto:[email protected]', + resources => { + repository => { + url => 'https://github.com/libwww-perl/libwww-perl.git', + web => 'https://github.com/libwww-perl/libwww-perl', + type => 'git', + }, + bugtracker => { + mailto => '[email protected]', + web => 'https://rt.cpan.org/Public/Dist/Display.html?Name=libwww-perl', + }, + x_MailingList => 'mailto:[email protected]', + x_IRC => 'irc://irc.perl.org/#lwp', } }, clean => { FILES => join(" ", map "bin/$_", grep /^[A-Z]+$/, @prog) }, + test => { TESTS => $tests }, ); - - -sub MY::test { - q( -TEST_VERBOSE=0 - -test : pure_all - $(FULLPERL) t/TEST $(TEST_VERBOSE) + # compatibility with older versions of MakeMaker + my $developer = -f ".gitignore"; -test_hudson : pure_all - $(FULLPERL) t/TEST $(TEST_VERBOSE) --formatter=TAP::Formatter::JUnit + die 'need to do a merge with CPAN::Meta::Requirements!!' + if $developer && exists $WriteMakefileArgs{BUILD_REQUIRES}; -); -} + if (!eval { ExtUtils::MakeMaker->VERSION('6.6303') }) { + $WriteMakefileArgs{BUILD_REQUIRES} = $WriteMakefileArgs{TEST_REQUIRES}; + delete $WriteMakefileArgs{TEST_REQUIRES}; + } + if (!eval { ExtUtils::MakeMaker->VERSION('6.5501') }) { + @{$WriteMakefileArgs{PREREQ_PM}}{ keys %{$WriteMakefileArgs{BUILD_REQUIRES}} } = + @{$WriteMakefileArgs{BUILD_REQUIRES}}{ keys %{$WriteMakefileArgs{BUILD_REQUIRES}} }; -sub flag_file { - my($file, $create) = @_; - if ($create) { - open(my $fh, ">", $file) || die "Can't create $file: $!"; - } - else { - unlink($file); + delete $WriteMakefileArgs{BUILD_REQUIRES}; } -} -BEGIN { - # compatibility with older versions of MakeMaker - my $developer = -f ".gitignore"; my %mm_req = ( LICENCE => 6.31, META_MERGE => 6.45, META_ADD => 6.45, MIN_PERL_VERSION => 6.48, ); - undef(*WriteMakefile); - *WriteMakefile = sub { - my %arg = @_; - for (keys %mm_req) { - unless (eval { ExtUtils::MakeMaker->VERSION($mm_req{$_}) }) { - warn "$_ $@" if $developer; - delete $arg{$_}; - } + for (keys %mm_req) { + unless (eval { ExtUtils::MakeMaker->VERSION($mm_req{$_}) }) { + warn "$_ $@" if $developer; + delete $WriteMakefileArgs{$_}; } - ExtUtils::MakeMaker::WriteMakefile(%arg); - }; + } } + +WriteMakefile(%WriteMakefileArgs); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/bin/lwp-download new/libwww-perl-6.13/bin/lwp-download --- old/libwww-perl-6.05/bin/lwp-download 2012-01-14 01:25:46.000000000 +0100 +++ new/libwww-perl-6.13/bin/lwp-download 2015-02-10 03:38:29.000000000 +0100 @@ -37,7 +37,7 @@ and that you don't have much options to worry about. Use the C<-a> option to save the file in text (ascii) mode. Might -make a difference on dosish systems. +make a difference on DOSish systems. =head1 EXAMPLE @@ -79,7 +79,7 @@ my $url = URI->new(decode(locale => shift) || usage()); my $argfile = encode(locale_fs => decode(locale => shift)); usage() if defined($argfile) && !length($argfile); -my $VERSION = "6.00"; +my $VERSION = "6.09"; my $ua = LWP::UserAgent->new( agent => "lwp-download/$VERSION ", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/bin/lwp-dump new/libwww-perl-6.13/bin/lwp-dump --- old/libwww-perl-6.05/bin/lwp-dump 2012-01-14 01:25:46.000000000 +0100 +++ new/libwww-perl-6.13/bin/lwp-dump 2015-02-10 03:38:35.000000000 +0100 @@ -6,7 +6,7 @@ use Encode; use Encode::Locale; -my $VERSION = "6.00"; +my $VERSION = "6.09"; GetOptions(\my %opt, 'parse-head', @@ -68,7 +68,7 @@ =head1 DESCRIPTION -The B<lwp-dump> program will get the resource indentified by the URL and then +The B<lwp-dump> program will get the resource identified by the URL and then dump the response object to STDOUT. This will display the headers returned and the initial part of the content, escaped so that it's safe to display even binary content. The escapes syntax used is the same as for Perl's double diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/bin/lwp-mirror new/libwww-perl-6.13/bin/lwp-mirror --- old/libwww-perl-6.05/bin/lwp-mirror 2013-03-11 22:34:19.000000000 +0100 +++ new/libwww-perl-6.13/bin/lwp-mirror 2015-02-10 03:38:39.000000000 +0100 @@ -47,7 +47,7 @@ $progname =~ s,.*/,,; # use basename only $progname =~ s/\.\w*$//; #strip extension if any -$VERSION = "6.05"; +$VERSION = "6.09"; $opt_h = undef; # print usage $opt_v = undef; # print version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/bin/lwp-request new/libwww-perl-6.13/bin/lwp-request --- old/libwww-perl-6.05/bin/lwp-request 2012-02-11 16:02:09.000000000 +0100 +++ new/libwww-perl-6.13/bin/lwp-request 2015-02-10 03:38:46.000000000 +0100 @@ -184,7 +184,7 @@ $progname =~ s,.*[\\/],,; # use basename only $progname =~ s/\.\w*$//; # strip extension, if any -$VERSION = "6.03"; +$VERSION = "6.09"; require LWP; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/lib/LWP/Authen/Digest.pm new/libwww-perl-6.13/lib/LWP/Authen/Digest.pm --- old/libwww-perl-6.05/lib/LWP/Authen/Digest.pm 2012-01-14 01:25:46.000000000 +0100 +++ new/libwww-perl-6.13/lib/LWP/Authen/Digest.pm 2015-02-14 19:38:12.000000000 +0100 @@ -58,7 +58,14 @@ my @pairs; for (@order) { next unless defined $resp{$_}; - push(@pairs, "$_=" . qq("$resp{$_}")); + + # RFC2617 sais that qop-value and nc-value should be unquoted. + if ( $_ eq 'qop' || $_ eq 'nc' ) { + push(@pairs, "$_=" . $resp{$_}); + } + else { + push(@pairs, "$_=" . qq("$resp{$_}")); + } } my $auth_value = "Digest " . join(", ", @pairs); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/lib/LWP/Authen/Ntlm.pm new/libwww-perl-6.13/lib/LWP/Authen/Ntlm.pm --- old/libwww-perl-6.05/lib/LWP/Authen/Ntlm.pm 2012-01-14 01:25:46.000000000 +0100 +++ new/libwww-perl-6.13/lib/LWP/Authen/Ntlm.pm 2015-02-14 19:38:12.000000000 +0100 @@ -3,7 +3,7 @@ use strict; use vars qw/$VERSION/; -$VERSION = "6.00"; +$VERSION = "6.13"; use Authen::NTLM "1.02"; use MIME::Base64 "2.12"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/lib/LWP/ConnCache.pm new/libwww-perl-6.13/lib/LWP/ConnCache.pm --- old/libwww-perl-6.05/lib/LWP/ConnCache.pm 2012-01-14 01:25:46.000000000 +0100 +++ new/libwww-perl-6.13/lib/LWP/ConnCache.pm 2015-02-14 19:38:12.000000000 +0100 @@ -3,7 +3,7 @@ use strict; use vars qw($VERSION $DEBUG); -$VERSION = "6.02"; +$VERSION = "6.13"; sub new { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/lib/LWP/Debug.pm new/libwww-perl-6.13/lib/LWP/Debug.pm --- old/libwww-perl-6.05/lib/LWP/Debug.pm 2012-01-14 01:25:46.000000000 +0100 +++ new/libwww-perl-6.13/lib/LWP/Debug.pm 2015-02-14 19:38:12.000000000 +0100 @@ -73,20 +73,20 @@ =head1 DESCRIPTION -LWP::Debug used to provide tracing facilities, but these are not used +LWP::Debug is used to provide tracing facilities, but these are not used by LWP any more. The code in this module is kept around -(undocumented) so that 3rd party code that happen to use the old +(undocumented) so that 3rd party code that happens to use the old interfaces continue to run. One useful feature that LWP::Debug provided (in an imprecise and troublesome way) was network traffic monitoring. The following -section provide some hints about recommened replacements. +section provides some hints about recommended replacements. =head2 Network traffic monitoring The best way to monitor the network traffic that LWP generates is to use an external TCP monitoring program. The Wireshark program -(L<http://www.wireshark.org/>) is higly recommended for this. +(L<http://www.wireshark.org/>) is highly recommended for this. Another approach it to use a debugging HTTP proxy server and make LWP direct all its traffic via this one. Call C<< $ua->proxy >> to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/lib/LWP/Protocol/ftp.pm new/libwww-perl-6.13/lib/LWP/Protocol/ftp.pm --- old/libwww-perl-6.05/lib/LWP/Protocol/ftp.pm 2012-01-14 01:25:46.000000000 +0100 +++ new/libwww-perl-6.13/lib/LWP/Protocol/ftp.pm 2015-02-14 19:38:12.000000000 +0100 @@ -160,7 +160,7 @@ my $user = $url->user; my $password = $url->password; - # If a basic autorization header is present than we prefer these over + # If a basic authorization header is present than we prefer these over # the username/password specified in the URL. { my($u,$p) = $request->authorization_basic; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/lib/LWP/Protocol/http.pm new/libwww-perl-6.13/lib/LWP/Protocol/http.pm --- old/libwww-perl-6.05/lib/LWP/Protocol/http.pm 2012-11-08 20:56:21.000000000 +0100 +++ new/libwww-perl-6.13/lib/LWP/Protocol/http.pm 2015-02-14 19:38:12.000000000 +0100 @@ -16,15 +16,11 @@ sub _new_socket { my($self, $host, $port, $timeout) = @_; - my $conn_cache = $self->{ua}{conn_cache}; - if ($conn_cache) { - if (my $sock = $conn_cache->withdraw($self->socket_type, "$host:$port")) { - return $sock if $sock && !$sock->can_read(0); - # if the socket is readable, then either the peer has closed the - # connection or there are some garbage bytes on it. In either - # case we abandon it. - $sock->close; - } + + # IPv6 literal IP address should be [bracketed] to remove + # ambiguity between ip address and port number. + if ( ($host =~ /:/) && ($host !~ /^\[/) ) { + $host = "[$host]"; } local($^W) = 0; # IO::Socket::INET can be noisy @@ -33,7 +29,7 @@ LocalAddr => $self->{ua}{local_address}, Proto => 'tcp', Timeout => $timeout, - KeepAlive => !!$conn_cache, + KeepAlive => !!$self->{ua}{conn_cache}, SendTE => 1, $self->_extra_sock_opts($host, $port), ); @@ -104,9 +100,10 @@ } $h->init_header('Host' => $hhost); - if ($proxy) { + if ($proxy && $url->scheme ne 'https') { # Check the proxy URI's userinfo() for proxy credentials - # export http_proxy="http://proxyuser:proxypass@proxyhost:port"; + # export http_proxy="http://proxyuser:proxypass@proxyhost:port";. + # For https only the initial CONNECT requests needs authorization. my $p_auth = $proxy->userinfo(); if(defined $p_auth) { require URI::Escape; @@ -140,26 +137,80 @@ } my $url = $request->uri; - my($host, $port, $fullpath); - # Check if we're proxy'ing - if (defined $proxy) { - # $proxy is an URL to an HTTP server which will proxy this request - $host = $proxy->host; - $port = $proxy->port; - $fullpath = $method eq "CONNECT" ? - ($url->host . ":" . $url->port) : - $url->as_string; + # Proxying SSL with a http proxy needs issues a CONNECT request to build a + # tunnel and then upgrades the tunnel to SSL. But when doing keep-alive the + # https request does not need to be the first request in the connection, so + # we need to distinguish between + # - not yet connected (create socket and ssl upgrade) + # - connected but not inside ssl tunnel (ssl upgrade) + # - inside ssl tunnel to the target - once we are in the tunnel to the + # target we cannot only reuse the tunnel for more https requests with the + # same target + + my $ssl_tunnel = $proxy && $url->scheme eq 'https' + && $url->host.":".$url->port; + + my ($host,$port) = $proxy + ? ($proxy->host,$proxy->port) + : ($url->host,$url->port); + my $fullpath = + $method eq 'CONNECT' ? $url->host . ":" . $url->port : + $proxy && ! $ssl_tunnel ? $url->as_string : + do { + my $path = $url->path_query; + $path = "/$path" if $path !~m{^/}; + $path + }; + + my $socket; + my $conn_cache = $self->{ua}{conn_cache}; + my $cache_key; + if ( $conn_cache ) { + $cache_key = "$host:$port"; + # For https we reuse the socket immediatly only if it has an established + # tunnel to the target. Otherwise a CONNECT request followed by an SSL + # upgrade need to be done first. The request itself might reuse an + # existing non-ssl connection to the proxy + $cache_key .= "!".$ssl_tunnel if $ssl_tunnel; + if ( $socket = $conn_cache->withdraw($self->socket_type,$cache_key)) { + if ($socket->can_read(0)) { + # if the socket is readable, then either the peer has closed the + # connection or there are some garbage bytes on it. In either + # case we abandon it. + $socket->close; + $socket = undef; + } # else use $socket + } } - else { - $host = $url->host; - $port = $url->port; - $fullpath = $url->path_query; - $fullpath = "/$fullpath" unless $fullpath =~ m,^/,; + + if ( ! $socket && $ssl_tunnel ) { + my $proto_https = LWP::Protocol::create('https',$self->{ua}) + or die "no support for scheme https found"; + + # only if ssl socket class is IO::Socket::SSL we can upgrade + # a plain socket to SSL. In case of Net::SSL we fall back to + # the old version + if ( my $upgrade_sub = $proto_https->can('_upgrade_sock')) { + my $response = $self->request( + HTTP::Request->new('CONNECT',"http://$ssl_tunnel";), + $proxy, + undef,$size,$timeout + ); + $response->is_success or die + "establishing SSL tunnel failed: ".$response->status_line; + $socket = $upgrade_sub->($proto_https, + $response->{client_socket},$url) + or die "SSL upgrade failed: $@"; + } else { + $socket = $proto_https->_new_socket($url->host,$url->port,$timeout); + } } - # connect to remote site - my $socket = $self->_new_socket($host, $port, $timeout); + if ( ! $socket ) { + # connect to remote site w/o reusing established socket + $socket = $self->_new_socket($host, $port, $timeout ); + } my $http_version = ""; if (my $proto = $request->protocol) { @@ -231,7 +282,7 @@ my $n = $socket->syswrite($req_buf, length($req_buf)); unless (defined $n) { redo WRITE if $!{EINTR}; - if ($!{EAGAIN}) { + if ($!{EWOULDBLOCK} || $!{EAGAIN}) { select(undef, undef, undef, 0.1); redo WRITE; } @@ -301,7 +352,7 @@ { my $nfound = select($rbits, $wbits, undef, $sel_timeout); if ($nfound < 0) { - if ($!{EINTR} || $!{EAGAIN}) { + if ($!{EINTR} || $!{EWOULDBLOCK} || $!{EAGAIN}) { if ($time_before) { $sel_timeout = $sel_timeout_before - (time - $time_before); $sel_timeout = 0 if $sel_timeout < 0; @@ -322,7 +373,7 @@ my $buf = $socket->_rbuf; my $n = $socket->sysread($buf, 1024, length($buf)); unless (defined $n) { - die "read failed: $!" unless $!{EINTR} || $!{EAGAIN}; + die "read failed: $!" unless $!{EINTR} || $!{EWOULDBLOCK} || $!{EAGAIN}; # if we get here the rest of the block will do nothing # and we will retry the read on the next round } @@ -353,7 +404,7 @@ if (defined($wbits) && $wbits =~ /[^\0]/) { my $n = $socket->syswrite($$wbuf, length($$wbuf), $woffset); unless (defined $n) { - die "write failed: $!" unless $!{EINTR} || $!{EAGAIN}; + die "write failed: $!" unless $!{EINTR} || $!{EWOULDBLOCK} || $!{EAGAIN}; $n = 0; # will retry write on the next round } elsif ($n == 0) { @@ -410,7 +461,7 @@ { $n = $socket->read_entity_body($buf, $size); unless (defined $n) { - redo READ if $!{EINTR} || $!{EAGAIN}; + redo READ if $!{EINTR} || $!{EWOULDBLOCK} || $!{EAGAIN} || $!{ENOTTY}; die "read failed: $!"; } redo READ if $n == -1; @@ -428,13 +479,13 @@ # keep-alive support unless ($drop_connection) { - if (my $conn_cache = $self->{ua}{conn_cache}) { + if ($cache_key) { my %connection = map { (lc($_) => 1) } split(/\s*,\s*/, ($response->header("Connection") || "")); if (($peer_http_version eq "1.1" && !$connection{close}) || $connection{"keep-alive"}) { - $conn_cache->deposit($self->socket_type, "$host:$port", $socket); + $conn_cache->deposit($self->socket_type, $cache_key, $socket); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/lib/LWP/Protocol.pm new/libwww-perl-6.13/lib/LWP/Protocol.pm --- old/libwww-perl-6.05/lib/LWP/Protocol.pm 2012-01-14 01:25:46.000000000 +0100 +++ new/libwww-perl-6.13/lib/LWP/Protocol.pm 2015-02-14 19:38:12.000000000 +0100 @@ -2,7 +2,7 @@ require LWP::MemberMixin; @ISA = qw(LWP::MemberMixin); -$VERSION = "6.00"; +$VERSION = "6.13"; use strict; use Carp (); @@ -207,7 +207,7 @@ supported by the LWP library. When creating an instance of this class using -C<LWP::Protocol::create($url)>, and you get an initialised subclass +C<LWP::Protocol::create($url)>, and you get an initialized subclass appropriate for that access method. In other words, the LWP::Protocol::create() function calls the constructor for one of its subclasses. @@ -260,7 +260,7 @@ The $collector is a routine that will be called and which is responsible for returning pieces (as ref to scalar) of the content to process. The $collector signals EOF by returning a reference to an -empty sting. +empty string. The return value from collect() is the $response object reference. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/lib/LWP/RobotUA.pm new/libwww-perl-6.13/lib/LWP/RobotUA.pm --- old/libwww-perl-6.05/lib/LWP/RobotUA.pm 2012-02-11 16:02:09.000000000 +0100 +++ new/libwww-perl-6.13/lib/LWP/RobotUA.pm 2015-02-14 19:38:12.000000000 +0100 @@ -2,7 +2,7 @@ require LWP::UserAgent; @ISA = qw(LWP::UserAgent); -$VERSION = "6.03"; +$VERSION = "6.13"; require WWW::RobotRules; require HTTP::Request; @@ -215,7 +215,7 @@ But before you consider writing a robot, take a look at <URL:http://www.robotstxt.org/>. -When you use a I<LWP::RobotUA> object as your user agent, then you do not +When you use an I<LWP::RobotUA> object as your user agent, then you do not really have to think about these things yourself; C<robots.txt> files are automatically consulted and obeyed, the server isn't queried too rapidly, and so on. Just send requests @@ -264,7 +264,7 @@ arrive too fast, defined as $ua->delay minutes not passed since last request to the given server. The default is TRUE. If this value is FALSE then an internal SERVICE_UNAVAILABLE response will be generated. -It will have an Retry-After header that indicates when it is OK to +It will have a Retry-After header that indicates when it is OK to send another request to this server. =item $ua->rules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/lib/LWP/Simple.pm new/libwww-perl-6.13/lib/LWP/Simple.pm --- old/libwww-perl-6.05/lib/LWP/Simple.pm 2012-02-18 15:24:06.000000000 +0100 +++ new/libwww-perl-6.13/lib/LWP/Simple.pm 2015-02-14 19:38:12.000000000 +0100 @@ -14,7 +14,7 @@ use HTTP::Status; push(@EXPORT, @HTTP::Status::EXPORT); -$VERSION = "6.00"; +$VERSION = "6.13"; sub import { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/lib/LWP/UserAgent.pm new/libwww-perl-6.13/lib/LWP/UserAgent.pm --- old/libwww-perl-6.05/lib/LWP/UserAgent.pm 2013-03-11 22:34:31.000000000 +0100 +++ new/libwww-perl-6.13/lib/LWP/UserAgent.pm 2015-02-14 19:38:12.000000000 +0100 @@ -5,7 +5,7 @@ require LWP::MemberMixin; @ISA = qw(LWP::MemberMixin); -$VERSION = "6.05"; +$VERSION = "6.13"; use HTTP::Request (); use HTTP::Response (); @@ -346,7 +346,8 @@ ) { my $proxy = ($code == &HTTP::Status::RC_PROXY_AUTHENTICATION_REQUIRED); - my $ch_header = $proxy ? "Proxy-Authenticate" : "WWW-Authenticate"; + my $ch_header = $proxy || $request->method eq 'CONNECT' + ? "Proxy-Authenticate" : "WWW-Authenticate"; my @challenge = $response->header($ch_header); unless (@challenge) { $response->header("Client-Warning" => @@ -935,7 +936,7 @@ else { # Replace the stale file with a fresh copy if ( -e $file ) { - # Some dosish systems fail to rename if the target exists + # Some DOSish systems fail to rename if the target exists chmod 0777, $file; unlink $file; } @@ -1195,8 +1196,8 @@ =item $ua->cookie_jar( $cookie_jar_obj ) Get/set the cookie jar object to use. The only requirement is that -the cookie jar object must implement the extract_cookies($request) and -add_cookie_header($response) methods. These methods will then be +the cookie jar object must implement the extract_cookies($response) and +add_cookie_header($request) methods. These methods will then be invoked by the user agent as requests are sent and responses are received. Normally this will be a C<HTTP::Cookies> object or some subclass. @@ -1345,7 +1346,7 @@ =item $ua->show_progress( $boolean ) Get/set a value indicating whether a progress bar should be displayed -on on the terminal as requests are processed. The default is FALSE. +on the terminal as requests are processed. The default is FALSE. =item $ua->timeout @@ -1480,7 +1481,7 @@ =item request_preprepare => sub { my($request, $ua, $h) = @_; ... } The handler is called before the C<request_prepare> and other standard -initialization of of the request. This can be used to set up headers +initialization of the request. This can be used to set up headers and attributes that the C<request_prepare> handler depends on. Proxy initialization should take place here; but in general don't register handlers for this phase. @@ -1547,7 +1548,7 @@ Remove handlers that match the given %matchspec. If $phase is not provided remove handlers from all phases. -Be careful as calling this function with %matchspec that is not not +Be careful as calling this function with %matchspec that is not specific enough can remove handlers not owned by you. It's probably better to use the set_my_handler() method instead. @@ -1567,7 +1568,7 @@ Will retrieve the matching handler as hash ref. -If C<$init> is passed passed as a TRUE value, create and add the +If C<$init> is passed as a TRUE value, create and add the handler if it's not found. If $init is a subroutine reference, then it's called with the created handler hash as argument. This sub might populate the hash with extra fields; especially the callback. If @@ -1709,7 +1710,7 @@ will be downloaded again. The modification time of the file will be forced to match that of the server. -The return value is the the response object. +The return value is the response object. =item $ua->request( $request ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/lib/LWP.pm new/libwww-perl-6.13/lib/LWP.pm --- old/libwww-perl-6.05/lib/LWP.pm 2013-03-11 22:33:18.000000000 +0100 +++ new/libwww-perl-6.13/lib/LWP.pm 2015-02-14 19:38:12.000000000 +0100 @@ -1,6 +1,6 @@ package LWP; -$VERSION = "6.05"; +$VERSION = "6.13"; sub Version { $VERSION; } require 5.008; @@ -105,7 +105,7 @@ =over 3 -=item +=item * The HTTP protocol is based on a request/response paradigm. A client establishes a connection with a server and sends a request to the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/lwptut.pod new/libwww-perl-6.13/lwptut.pod --- old/libwww-perl-6.05/lwptut.pod 2012-02-11 16:02:09.000000000 +0100 +++ new/libwww-perl-6.13/lwptut.pod 2015-02-10 03:24:08.000000000 +0100 @@ -241,7 +241,7 @@ # save it to disk when done )); -That file will be an LWP-specific format. If you want to be access the +That file will be in LWP-specific format. If you want to access the cookies in your Netscape cookies file, you can use the HTTP::Cookies::Netscape class: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/t/README new/libwww-perl-6.13/t/README --- old/libwww-perl-6.05/t/README 2012-01-14 01:25:46.000000000 +0100 +++ new/libwww-perl-6.13/t/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -Self test suite for the libwww-perl library -------------------------------------------- - -Tests are invoked by running the ./TEST script, but usually you run -the tests with "make test" at the top libwww-perl directory. Use -v -option for verbose tests. You might run an individual test like this: - - ./TEST -v base/date - -or all tests in a directory like this - - ./TEST base - -You enable network tests by creating the "net/config.pl" file. A good -start is to make a copy of the "net/config.pl.dist" file. For network -tests you should also make a link from the cgi-bin directory of your -http server to the "net/cgi-bin" directory. You might also have to -check that the interpreter line (#!.../perl) in the scripts is ok for -your system. The following setup works for my site: - - ln -s `pwd`/net/cgi-bin ~www/cgi-bin/lwp - cp net/config.pl.dist net/config.pl - emacs net/config.pl # fix if necessary - ./TEST net diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/t/TEST new/libwww-perl-6.13/t/TEST --- old/libwww-perl-6.05/t/TEST 2012-02-18 16:04:06.000000000 +0100 +++ new/libwww-perl-6.13/t/TEST 1970-01-01 01:00:00.000000000 +0100 @@ -1,59 +0,0 @@ -#!/usr/local/bin/perl -w - -use strict; -use Test::Harness; -$Test::Harness::verbose = shift - if defined $ARGV[0] and $ARGV[0] =~ /^\d+$/ || $ARGV[0] eq "-v"; - -my $formatter; -if (@ARGV && $ARGV[0] =~ /^--formatter=/) { - (undef, $formatter) = split(/=/, shift, 2); - $formatter = "TAP::Formatter::$formatter" unless $formatter =~ /::/ -} - -# make sure we are in the "t" directory -unless (-d "base") { - chdir "t" or die "Can't chdir: $!"; - - # fix all relative library locations - foreach (@INC) { - $_ = "../$_" unless m,^([a-z]:)?[/\\],i; - } -} - -unshift(@INC, "../blib/lib", "../blib/arch"); - -my @tests; -if (@ARGV) { - for (@ARGV) { - if (-d $_) { - push(@tests, <$_/*.t>); - } - else { - $_ .= ".t" unless /\.t$/; - push(@tests, $_); - } - } -} -else { - @tests = (<base/*.t>, <html/*.t>, <robot/*.t>, <local/*.t>); - push(@tests, <live/*.t>) if -f "live/ENABLED"; - push(@tests, <live/jigsaw/*.t>) if -f "live/jigsaw/ENABLED"; - push(@tests, <net/*.t>) if -f "net/config.pl"; -} - -if ($formatter) { - use File::Path; File::Path::rmtree("tap"); - $ENV{PERL_TEST_HARNESS_DUMP_TAP} = "tap"; - require TAP::Harness; - my $harness = TAP::Harness->new({ - formatter_class => $formatter, - merge => 1, - #timer => 1, - lib => \@INC, - }); - $harness->runtests(@tests); -} -else { - runtests @tests; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/t/base/proxy.t new/libwww-perl-6.13/t/base/proxy.t --- old/libwww-perl-6.05/t/base/proxy.t 1970-01-01 01:00:00.000000000 +0100 +++ new/libwww-perl-6.13/t/base/proxy.t 2015-02-10 03:24:08.000000000 +0100 @@ -0,0 +1,17 @@ +#!perl -w + +use strict; +use Test; + +plan tests => 2; + +use LWP::UserAgent; + +for my $varname ( qw(ABSURDLY_NAMED_PROXY MY_PROXY) ) { + + $ENV{ $varname } = "foobar"; + + my $ua = LWP::UserAgent->new; + eval { $ua->env_proxy(); }; + ok($@, ""); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/t/local/http.t new/libwww-perl-6.13/t/local/http.t --- old/libwww-perl-6.05/t/local/http.t 2012-02-18 16:35:09.000000000 +0100 +++ new/libwww-perl-6.13/t/local/http.t 2015-02-14 19:12:29.000000000 +0100 @@ -1,9 +1,10 @@ +use FindBin qw($Bin); if ($^O eq "MacOS") { print "1..0\n"; exit(0); } -unless (-f "CAN_TALK_TO_OURSELF") { +if (0 != system($^X, "$Bin/../../talk-to-ourself")) { print "1..0 # Skipped: Can't talk to ourself (misconfigured system)\n"; exit; } @@ -46,11 +47,11 @@ use Config; my $perl = $Config{'perlpath'}; $perl = $^X if $^O eq 'VMS' or -x $^X and $^X =~ m,^([a-z]:)?/,i; - open(DAEMON, "$perl local/http.t daemon |") or die "Can't exec daemon: $!"; + open(DAEMON, "$perl $0 daemon |") or die "Can't exec daemon: $!"; } use Test::More; -plan tests => 59; +plan tests => 63; my $greeting = <DAEMON>; $greeting =~ /(<[^>]+>)/; @@ -319,6 +320,78 @@ #---------------------------------------------------------------- +print "Check digest authorization...\n"; +sub httpd_get_digest +{ + my($c, $r) = @_; +# print STDERR $r->as_string; + my $auth = $r->authorization; + my %auth_params; + if ( defined($auth) && $auth =~ /^Digest\s+(.*)$/ ) { + %auth_params = map { split /=/ } split /,\s*/, $1; + } + if ( %auth_params && + $auth_params{username} eq "\"ok 23\"" && + $auth_params{realm} eq "\"libwww-perl-digest\"" && + $auth_params{qop} eq "auth" && + $auth_params{algorithm} eq "\"MD5\"" && + $auth_params{uri} eq "\"/digest\"" && + $auth_params{nonce} eq "\"12345\"" && + $auth_params{nc} eq "00000001" && + defined($auth_params{cnonce}) && + defined($auth_params{response}) + ) { + $c->send_basic_header(200); + print $c "Content-Type: text/plain"; + $c->send_crlf; + $c->send_crlf; + $c->print("ok\n"); + } + else { + $c->send_basic_header(401); + $c->print("WWW-Authenticate: Digest realm=\"libwww-perl-digest\", nonce=\"12345\", qop=auth\015\012"); + $c->send_crlf; + } +} + +{ + package MyUA2; @ISA=qw(LWP::UserAgent); + sub get_basic_credentials { + my($self, $realm, $uri, $proxy) = @_; + if ($realm eq "libwww-perl-digest" && $uri->rel($base) eq "digest") { + return ("ok 23", "xyzzy"); + } + else { + return undef; + } + } +} +$req = new HTTP::Request GET => url("/digest", $base); +$res = MyUA2->new->request($req); +#print STDERR $res->as_string; + +ok($res->is_success); +#print $res->content; + +# Let's try with a $ua that does not pass out credentials +$ua->{basic_authentication}=undef; +$res = $ua->request($req); +is($res->code, 401, 'respone code 401'); + +# Let's try to set credentials for this realm +$ua->credentials($req->uri->host_port, "libwww-perl-digest", "ok 23", "xyzzy"); +$res = $ua->request($req); +#print STDERR $res->as_string; +ok($res->is_success); + +# Then illegal credentials +$ua->credentials($req->uri->host_port, "libwww-perl-digest", "user2", "passwd"); +$res = $ua->request($req); +is($res->code, 401, 'response code 401'); + + + +#---------------------------------------------------------------- print "Check proxy...\n"; sub httpd_get_proxy { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/t/net/http-get.t new/libwww-perl-6.13/t/net/http-get.t --- old/libwww-perl-6.05/t/net/http-get.t 2012-01-14 01:25:46.000000000 +0100 +++ new/libwww-perl-6.13/t/net/http-get.t 2015-02-14 19:12:29.000000000 +0100 @@ -3,12 +3,18 @@ # Check GET via HTTP. # -print "1..2\n"; +use FindBin qw($Bin); +if (!-e "$Bin/config.pl") { + print "1..0 # SKIP no net config file"; + exit 0; +} -require "net/config.pl"; +require "$Bin/config.pl"; require HTTP::Request; require LWP::UserAgent; +print "1..2\n"; + my $ua = new LWP::UserAgent; # create a useragent to test $netloc = $net::httpserver; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/t/net/http-post.t new/libwww-perl-6.13/t/net/http-post.t --- old/libwww-perl-6.05/t/net/http-post.t 2012-01-14 01:25:46.000000000 +0100 +++ new/libwww-perl-6.13/t/net/http-post.t 2015-02-14 19:12:29.000000000 +0100 @@ -3,12 +3,18 @@ # Check POST via HTTP. # -print "1..2\n"; +use FindBin qw($Bin); +if (!-e "$Bin/config.pl") { + print "1..0 # SKIP no net config file"; + exit 0; +} -require "net/config.pl"; +require "$Bin/config.pl"; require HTTP::Request; require LWP::UserAgent; +print "1..2\n"; + $netloc = $net::httpserver; $script = $net::cgidir . "/test"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/t/net/http-timeout.t new/libwww-perl-6.13/t/net/http-timeout.t --- old/libwww-perl-6.05/t/net/http-timeout.t 2012-01-14 01:25:46.000000000 +0100 +++ new/libwww-perl-6.13/t/net/http-timeout.t 2015-02-14 19:12:29.000000000 +0100 @@ -2,12 +2,18 @@ # Check timeouts via HTTP. # -print "1..1\n"; +use FindBin qw($Bin); +if (!-e "$Bin/config.pl") { + print "1..0 # SKIP no net config file"; + exit 0; +} -require "net/config.pl"; +require "$Bin/config.pl"; require HTTP::Request; require LWP::UserAgent; +print "1..1\n"; + my $ua = new LWP::UserAgent; # create a useragent to test $ua->timeout(4); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/t/net/mirror.t new/libwww-perl-6.13/t/net/mirror.t --- old/libwww-perl-6.05/t/net/mirror.t 2012-01-14 01:25:46.000000000 +0100 +++ new/libwww-perl-6.13/t/net/mirror.t 2015-02-14 19:12:29.000000000 +0100 @@ -2,7 +2,13 @@ # Test mirroring a file # -require "net/config.pl"; +use FindBin qw($Bin); +if (!-e "$Bin/config.pl") { + print "1..0 # SKIP no net config file"; + exit 0; +} + +require "$Bin/config.pl"; require LWP::UserAgent; require HTTP::Status; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/t/net/moved.t new/libwww-perl-6.13/t/net/moved.t --- old/libwww-perl-6.05/t/net/moved.t 2012-01-14 01:25:46.000000000 +0100 +++ new/libwww-perl-6.13/t/net/moved.t 2015-02-14 19:12:29.000000000 +0100 @@ -1,11 +1,17 @@ #!/usr/local/bin/perl -w # -print "1..1\n"; +use FindBin qw($Bin); +if (!-e "$Bin/config.pl") { + print "1..0 # SKIP no net config file"; + exit 0; +} -require "net/config.pl"; +require "$Bin/config.pl"; require LWP::UserAgent; +print "1..1\n"; + $url = "http://$net::httpserver$net::cgidir/moved";; my $ua = new LWP::UserAgent; # create a useragent to test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/t/net/proxy.t new/libwww-perl-6.13/t/net/proxy.t --- old/libwww-perl-6.05/t/net/proxy.t 2012-01-14 01:25:46.000000000 +0100 +++ new/libwww-perl-6.13/t/net/proxy.t 2015-02-14 19:12:29.000000000 +0100 @@ -4,9 +4,16 @@ # via a HTTP proxy. # +use FindBin qw($Bin); +if (!-e "$Bin/config.pl") { + print "1..0 # SKIP no net config file"; + exit 0; +} + +require "$Bin/config.pl"; + print "1..1\n"; -require "net/config.pl"; unless (defined $net::ftp_proxy) { print "not ok 1\n"; exit 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/t/robot/ua-get.t new/libwww-perl-6.13/t/robot/ua-get.t --- old/libwww-perl-6.05/t/robot/ua-get.t 2012-02-11 16:02:09.000000000 +0100 +++ new/libwww-perl-6.13/t/robot/ua-get.t 2015-02-14 19:12:29.000000000 +0100 @@ -1,9 +1,10 @@ +use FindBin qw($Bin); if($^O eq "MacOS") { print "1..0\n"; exit(0); } -unless (-f "CAN_TALK_TO_OURSELF") { +if (0 != system($^X, "$Bin/../../talk-to-ourself")) { print "1..0 # Skipped: Can't talk to ourself (misconfigured system)\n"; exit; } @@ -47,7 +48,7 @@ use Config; my $perl = $Config{'perlpath'}; $perl = $^X if $^O eq 'VMS' or -x $^X and $^X =~ m,^([a-z]:)?/,i; - open(DAEMON , "$perl robot/ua.t daemon |") or die "Can't exec daemon: $!"; + open(DAEMON , "$perl $0 daemon |") or die "Can't exec daemon: $!"; } print "1..8\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwww-perl-6.05/t/robot/ua.t new/libwww-perl-6.13/t/robot/ua.t --- old/libwww-perl-6.05/t/robot/ua.t 2012-02-11 16:02:09.000000000 +0100 +++ new/libwww-perl-6.13/t/robot/ua.t 2015-02-14 19:12:29.000000000 +0100 @@ -1,9 +1,10 @@ +use FindBin qw($Bin); if($^O eq "MacOS") { print "1..0\n"; exit(0); } -unless (-f "CAN_TALK_TO_OURSELF") { +if (0 != system($^X, "$Bin/../../talk-to-ourself")) { print "1..0 # Skipped: Can't talk to ourself (misconfigured system)\n"; exit; } @@ -47,7 +48,7 @@ use Config; my $perl = $Config{'perlpath'}; $perl = $^X if $^O eq 'VMS' or -x $^X and $^X =~ m,^([a-z]:)?/,i; - open(DAEMON , "$perl robot/ua.t daemon |") or die "Can't exec daemon: $!"; + open(DAEMON , "$perl $0 daemon |") or die "Can't exec daemon: $!"; } print "1..7\n";
