From 47671828cab88478937dea67dd90f0796156aa54 Mon Sep 17 00:00:00 2001 From: TizenOpenSource Date: Thu, 28 Dec 2023 17:48:43 +0900 Subject: [PATCH] Imported Upstream version 6.72 --- Changes | 24 +++++ LICENSE | 183 ++++++++++++++++++++-------------- MANIFEST | 5 +- META.json | 175 ++++++++++++++++---------------- META.yml | 178 ++++++++++++++++----------------- Makefile.PL | 69 +++---------- cpanfile | 13 ++- dist.ini | 6 +- lib/LWP.pm | 2 +- lib/LWP/Authen/Basic.pm | 2 +- lib/LWP/Authen/Digest.pm | 2 +- lib/LWP/Authen/Ntlm.pm | 2 +- lib/LWP/ConnCache.pm | 2 +- lib/LWP/Debug.pm | 2 +- lib/LWP/Debug/TraceHTTP.pm | 2 +- lib/LWP/DebugFile.pm | 2 +- lib/LWP/MemberMixin.pm | 2 +- lib/LWP/Protocol.pm | 13 ++- lib/LWP/Protocol/cpan.pm | 2 +- lib/LWP/Protocol/data.pm | 2 +- lib/LWP/Protocol/file.pm | 2 +- lib/LWP/Protocol/ftp.pm | 2 +- lib/LWP/Protocol/gopher.pm | 2 +- lib/LWP/Protocol/http.pm | 2 +- lib/LWP/Protocol/loopback.pm | 2 +- lib/LWP/Protocol/mailto.pm | 2 +- lib/LWP/Protocol/nntp.pm | 2 +- lib/LWP/Protocol/nogo.pm | 2 +- lib/LWP/RobotUA.pm | 2 +- lib/LWP/Simple.pm | 2 +- lib/LWP/UserAgent.pm | 120 ++++++++++++++++------ perlimports.toml | 25 +++++ t/00-report-prereqs.dd | 20 ++-- t/00-report-prereqs.t | 18 ++-- t/10-attrs.t | 2 +- t/base/default_content_type.t | 16 +-- t/base/protocols.t | 2 +- t/base/proxy.t | 4 +- t/base/proxy_request.t | 44 ++++++++ t/base/simple.t | 2 +- t/leak/no_leak.t | 2 +- t/local/autoload-get.t | 4 +- t/local/autoload.t | 6 +- t/local/cookie_jar.t | 42 ++++++++ t/local/download_to_fh.t | 7 +- t/local/get.t | 5 +- t/local/http.t | 59 +++++++++-- t/local/httpsub.t | 7 +- t/local/protosub.t | 7 +- t/robot/ua-get.t | 12 +-- t/robot/ua.t | 13 ++- xt/author/eol.t | 2 + xt/author/live/apache-http10.t | 4 +- xt/author/live/jigsaw/auth-b.t | 4 +- xt/author/live/jigsaw/auth-d.t | 3 +- xt/author/live/jigsaw/chunk.t | 4 +- xt/author/live/jigsaw/md5-get.t | 5 +- xt/author/live/jigsaw/md5.t | 6 +- xt/author/live/jigsaw/neg-get.t | 2 +- xt/author/live/jigsaw/neg.t | 4 +- xt/author/live/jigsaw/redirect-post.t | 8 +- xt/author/live/jigsaw/te.t | 4 +- xt/author/live/online.t | 2 +- xt/author/misc/dbmrobot | 6 +- xt/author/misc/get-callback | 2 +- xt/author/misc/get-file | 2 +- xt/author/net/cache-timeouts.t | 8 +- xt/author/net/http-get.t | 6 +- xt/author/net/http-post.t | 6 +- xt/author/net/http-timeout.t | 6 +- xt/author/net/mirror.t | 4 +- xt/author/net/moved.t | 6 +- xt/author/net/proxy.t | 6 +- xt/author/pod-spell.t | 12 +++ xt/author/portability.t | 4 +- xt/release/changes_has_content.t | 2 +- 76 files changed, 734 insertions(+), 509 deletions(-) create mode 100644 perlimports.toml create mode 100644 t/base/proxy_request.t create mode 100644 t/local/cookie_jar.t diff --git a/Changes b/Changes index 98e3d89..ac3ad76 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,29 @@ Change history for libwww-perl +6.72 2023-07-17 22:01:19Z + - Don't mangle protocol scheme and don't require it to be valid if + implementor is already known (GH#436) (mwgamera) + +6.71 2023-06-20 19:44:19Z + - Use rather than require Module::Load (GH#435) (Olaf Alders) + +6.70 2023-04-30 13:22:56Z + - Add cookie_jar_class attribute to allow different cookie jar modules + to be used more easily (GH#91) (Tom Hukins, Julien Fiegehenn) + - POD now contains all default attributes (GH#428) (Julien Fiegehenn) + +6.69 2023-04-29 13:14:31Z + - Timeouts for cached connections now update (GH#73) (Eric Johnson) + - The conn_cache() can now be unset (GH#424) (Julien Fiegehenn) + - LWP::Protocol now only attempts to load modules once (GH#62) (Burak Gursoy) + - Fix a bug in no_proxy that allowed partial matches to a proxy address + to disable a proxy (GH#421) (Julien Fiegehenn) + +6.68 2023-02-27 19:18:33Z + - Remove dynamic dependency on HTTP::Status (GH#419) (Graham Knop) + - Raise minimum version of HTML::HeadParser to 3.71 (GH#422) (Olaf Alders) + - Apply perlimports to tests (GH#418) (Olaf Alders) + 6.67 2022-06-14 20:20:12Z - Remove undocumented LWP::Version sub (GH#416) (James Raspass) diff --git a/LICENSE b/LICENSE index 6cd4925..737beb6 100644 --- a/LICENSE +++ b/LICENSE @@ -270,110 +270,143 @@ necessary. Here a sample; alter the names: That's all there is to it! ---- The Artistic License 1.0 --- +--- The Perl Artistic License 1.0 --- This software is Copyright (c) 1995 by Gisle Aas. This is free software, licensed under: - The Artistic License 1.0 + The Perl Artistic License 1.0 -The Artistic License -Preamble -The intent of this document is to state the conditions under which a Package -may be copied, such that the Copyright Holder maintains some semblance of -artistic control over the development of the package, while giving the users of -the package the right to use and distribute the Package in a more-or-less -customary fashion, plus the right to make reasonable modifications. + + + The "Artistic License" + + Preamble + +The intent of this document is to state the conditions under which a +Package may be copied, such that the Copyright Holder maintains some +semblance of artistic control over the development of the package, +while giving the users of the package the right to use and distribute +the Package in a more-or-less customary fashion, plus the right to make +reasonable modifications. Definitions: - - "Package" refers to the collection of files distributed by the Copyright - Holder, and derivatives of that collection of files created through - textual modification. - - "Standard Version" refers to such a Package if it has not been modified, - or has been modified in accordance with the wishes of the Copyright - Holder. - - "Copyright Holder" is whoever is named in the copyright or copyrights for - the package. - - "You" is you, if you're thinking about copying or distributing this Package. - - "Reasonable copying fee" is whatever you can justify on the basis of media - cost, duplication charges, time of people involved, and so on. (You will - not be required to justify it to the Copyright Holder, but only to the - computing community at large as a market that must bear the fee.) - - "Freely Available" means that no fee is charged for the item itself, though - there may be fees involved in handling the item. It also means that - recipients of the item may redistribute it under the same conditions they - received it. + "Package" refers to the collection of files distributed by the + Copyright Holder, and derivatives of that collection of files + created through textual modification. + + "Standard Version" refers to such a Package if it has not been + modified, or has been modified in accordance with the wishes + of the Copyright Holder as specified below. + + "Copyright Holder" is whoever is named in the copyright or + copyrights for the package. + + "You" is you, if you're thinking about copying or distributing + this Package. + + "Reasonable copying fee" is whatever you can justify on the + basis of media cost, duplication charges, time of people involved, + and so on. (You will not be required to justify it to the + Copyright Holder, but only to the computing community at large + as a market that must bear the fee.) + + "Freely Available" means that no fee is charged for the item + itself, though there may be fees involved in handling the item. + It also means that recipients of the item may redistribute it + under the same conditions they received it. 1. You may make and give away verbatim copies of the source form of the Standard Version of this Package without restriction, provided that you duplicate all of the original copyright notices and associated disclaimers. -2. You may apply bug fixes, portability fixes and other modifications derived -from the Public Domain or from the Copyright Holder. A Package modified in such -a way shall still be considered the Standard Version. +2. You may apply bug fixes, portability fixes and other modifications +derived from the Public Domain or from the Copyright Holder. A Package +modified in such a way shall still be considered the Standard Version. -3. You may otherwise modify your copy of this Package in any way, provided that -you insert a prominent notice in each changed file stating how and when you -changed that file, and provided that you do at least ONE of the following: +3. You may otherwise modify your copy of this Package in any way, provided +that you insert a prominent notice in each changed file stating how and +when you changed that file, and provided that you do at least ONE of the +following: - a) place your modifications in the Public Domain or otherwise make them - Freely Available, such as by posting said modifications to Usenet or an - equivalent medium, or placing the modifications on a major archive site - such as ftp.uu.net, or by allowing the Copyright Holder to include your - modifications in the Standard Version of the Package. + a) place your modifications in the Public Domain or otherwise make them + Freely Available, such as by posting said modifications to Usenet or + an equivalent medium, or placing the modifications on a major archive + site such as uunet.uu.net, or by allowing the Copyright Holder to include + your modifications in the Standard Version of the Package. - b) use the modified Package only within your corporation or organization. + b) use the modified Package only within your corporation or organization. - c) rename any non-standard executables so the names do not conflict with - standard executables, which must also be provided, and provide a separate - manual page for each non-standard executable that clearly documents how it - differs from the Standard Version. + c) rename any non-standard executables so the names do not conflict + with standard executables, which must also be provided, and provide + a separate manual page for each non-standard executable that clearly + documents how it differs from the Standard Version. - d) make other distribution arrangements with the Copyright Holder. + d) make other distribution arrangements with the Copyright Holder. -4. You may distribute the programs of this Package in object code or executable -form, provided that you do at least ONE of the following: +4. You may distribute the programs of this Package in object code or +executable form, provided that you do at least ONE of the following: - a) distribute a Standard Version of the executables and library files, - together with instructions (in the manual page or equivalent) on where to - get the Standard Version. + a) distribute a Standard Version of the executables and library files, + together with instructions (in the manual page or equivalent) on where + to get the Standard Version. - b) accompany the distribution with the machine-readable source of the Package - with your modifications. + b) accompany the distribution with the machine-readable source of + the Package with your modifications. - c) accompany any non-standard executables with their corresponding Standard - Version executables, giving the non-standard executables non-standard - names, and clearly documenting the differences in manual pages (or - equivalent), together with instructions on where to get the Standard - Version. + c) give non-standard executables non-standard names, and clearly + document the differences in manual pages (or equivalent), together + with instructions on where to get the Standard Version. - d) make other distribution arrangements with the Copyright Holder. + d) make other distribution arrangements with the Copyright Holder. 5. You may charge a reasonable copying fee for any distribution of this -Package. You may charge any fee you choose for support of this Package. You -may not charge a fee for this Package itself. However, you may distribute this -Package in aggregate with other (possibly commercial) programs as part of a -larger (possibly commercial) software distribution provided that you do not -advertise this Package as a product of your own. - -6. The scripts and library files supplied as input to or produced as output -from the programs of this Package do not automatically fall under the copyright -of this Package, but belong to whomever generated them, and may be sold -commercially, and may be aggregated with this Package. - -7. C or perl subroutines supplied by you and linked into this Package shall not -be considered part of this Package. - -8. The name of the Copyright Holder may not be used to endorse or promote +Package. You may charge any fee you choose for support of this +Package. You may not charge a fee for this Package itself. However, +you may distribute this Package in aggregate with other (possibly +commercial) programs as part of a larger (possibly commercial) software +distribution provided that you do not advertise this Package as a +product of your own. You may embed this Package's interpreter within +an executable of yours (by linking); this shall be construed as a mere +form of aggregation, provided that the complete Standard Version of the +interpreter is so embedded. + +6. The scripts and library files supplied as input to or produced as +output from the programs of this Package do not automatically fall +under the copyright of this Package, but belong to whoever generated +them, and may be sold commercially, and may be aggregated with this +Package. If such scripts or library files are aggregated with this +Package via the so-called "undump" or "unexec" methods of producing a +binary executable image, then distribution of such an image shall +neither be construed as a distribution of this Package nor shall it +fall under the restrictions of Paragraphs 3 and 4, provided that you do +not represent such an executable image as a Standard Version of this +Package. + +7. C subroutines (or comparably compiled subroutines in other +languages) supplied by you and linked into this Package in order to +emulate subroutines and variables of the language defined by this +Package shall not be considered part of this Package, but are the +equivalent of input as in Paragraph 6, provided these subroutines do +not change the language in any way that would cause it to fail the +regression tests for the language. + +8. Aggregation of this Package with a commercial distribution is always +permitted provided that the use of this Package is embedded; that is, +when no overt attempt is made to make this Package's interfaces visible +to the end user of the commercial distribution. Such use shall not be +construed as a distribution of this Package. + +9. The name of the Copyright Holder may not be used to endorse or promote products derived from this software without specific prior written permission. -9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -The End + The End diff --git a/MANIFEST b/MANIFEST index f113fb3..d571527 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.025. +# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.030. CONTRIBUTING.md Changes INSTALL @@ -40,6 +40,7 @@ lib/LWP/Simple.pm lib/LWP/UserAgent.pm lwpcook.pod lwptut.pod +perlimports.toml t/00-report-prereqs.dd t/00-report-prereqs.t t/10-attrs.t @@ -47,12 +48,14 @@ t/base/default_content_type.t t/base/protocols.t t/base/protocols/nntp.t t/base/proxy.t +t/base/proxy_request.t t/base/simple.t t/base/ua.t t/base/ua_handlers.t t/leak/no_leak.t t/local/autoload-get.t t/local/autoload.t +t/local/cookie_jar.t t/local/download_to_fh.t t/local/get.t t/local/http.t diff --git a/META.json b/META.json index cfbd3f4..e463bb9 100644 --- a/META.json +++ b/META.json @@ -3,8 +3,8 @@ "author" : [ "Gisle Aas " ], - "dynamic_config" : 1, - "generated_by" : "Dist::Zilla version 6.025, CPAN::Meta::Converter version 2.150010", + "dynamic_config" : 0, + "generated_by" : "Dist::Zilla version 6.030, CPAN::Meta::Converter version 2.150010", "license" : [ "perl_5" ], @@ -22,11 +22,12 @@ "prereqs" : { "configure" : { "requires" : { - "CPAN::Meta::Requirements" : "2.120620", "ExtUtils::MakeMaker" : "0", "File::Copy" : "0", - "Getopt::Long" : "0", - "Module::Metadata" : "0" + "Getopt::Long" : "0" + }, + "suggests" : { + "JSON::PP" : "2.27300" } }, "develop" : { @@ -39,6 +40,7 @@ "IO::Handle" : "0", "IPC::Open3" : "0", "Pod::Coverage::TrustPod" : "0", + "Pod::Spell" : "1.25", "Test::EOL" : "2.00", "Test::LeakTrace" : "0.16", "Test::MinimumVersion" : "0", @@ -61,18 +63,20 @@ "File::Temp" : "0", "Getopt::Long" : "0", "HTML::Entities" : "0", - "HTML::HeadParser" : "0", + "HTML::HeadParser" : "3.71", + "HTTP::CookieJar::LWP" : "0", "HTTP::Cookies" : "6", "HTTP::Date" : "6", "HTTP::Negotiate" : "6", - "HTTP::Request" : "6", - "HTTP::Request::Common" : "6", - "HTTP::Response" : "6", - "HTTP::Status" : "6.07", + "HTTP::Request" : "6.18", + "HTTP::Request::Common" : "6.18", + "HTTP::Response" : "6.18", + "HTTP::Status" : "6.18", "IO::Select" : "0", "IO::Socket" : "0", "LWP::MediaTypes" : "6", "MIME::Base64" : "2.1", + "Module::Load" : "0", "Net::FTP" : "2.58", "Net::HTTP" : "6.18", "Scalar::Util" : "0", @@ -112,96 +116,96 @@ "provides" : { "LWP" : { "file" : "lib/LWP.pm", - "version" : "6.67" + "version" : "6.72" }, "LWP::Authen::Basic" : { "file" : "lib/LWP/Authen/Basic.pm", - "version" : "6.67" + "version" : "6.72" }, "LWP::Authen::Digest" : { "file" : "lib/LWP/Authen/Digest.pm", - "version" : "6.67" + "version" : "6.72" }, "LWP::Authen::Ntlm" : { "file" : "lib/LWP/Authen/Ntlm.pm", - "version" : "6.67" + "version" : "6.72" }, "LWP::ConnCache" : { "file" : "lib/LWP/ConnCache.pm", - "version" : "6.67" + "version" : "6.72" }, "LWP::Debug" : { "file" : "lib/LWP/Debug.pm", - "version" : "6.67", + "version" : "6.72", "x_deprecated" : 1 }, "LWP::Debug::TraceHTTP" : { "file" : "lib/LWP/Debug/TraceHTTP.pm", - "version" : "6.67" + "version" : "6.72" }, "LWP::DebugFile" : { "file" : "lib/LWP/DebugFile.pm", - "version" : "6.67" + "version" : "6.72" }, "LWP::MemberMixin" : { "file" : "lib/LWP/MemberMixin.pm", - "version" : "6.67" + "version" : "6.72" }, "LWP::Protocol" : { "file" : "lib/LWP/Protocol.pm", - "version" : "6.67" + "version" : "6.72" }, "LWP::Protocol::cpan" : { "file" : "lib/LWP/Protocol/cpan.pm", - "version" : "6.67" + "version" : "6.72" }, "LWP::Protocol::data" : { "file" : "lib/LWP/Protocol/data.pm", - "version" : "6.67" + "version" : "6.72" }, "LWP::Protocol::file" : { "file" : "lib/LWP/Protocol/file.pm", - "version" : "6.67" + "version" : "6.72" }, "LWP::Protocol::ftp" : { "file" : "lib/LWP/Protocol/ftp.pm", - "version" : "6.67" + "version" : "6.72" }, "LWP::Protocol::gopher" : { "file" : "lib/LWP/Protocol/gopher.pm", - "version" : "6.67" + "version" : "6.72" }, "LWP::Protocol::http" : { "file" : "lib/LWP/Protocol/http.pm", - "version" : "6.67" + "version" : "6.72" }, "LWP::Protocol::loopback" : { "file" : "lib/LWP/Protocol/loopback.pm", - "version" : "6.67" + "version" : "6.72" }, "LWP::Protocol::mailto" : { "file" : "lib/LWP/Protocol/mailto.pm", - "version" : "6.67" + "version" : "6.72" }, "LWP::Protocol::nntp" : { "file" : "lib/LWP/Protocol/nntp.pm", - "version" : "6.67" + "version" : "6.72" }, "LWP::Protocol::nogo" : { "file" : "lib/LWP/Protocol/nogo.pm", - "version" : "6.67" + "version" : "6.72" }, "LWP::RobotUA" : { "file" : "lib/LWP/RobotUA.pm", - "version" : "6.67" + "version" : "6.72" }, "LWP::Simple" : { "file" : "lib/LWP/Simple.pm", - "version" : "6.67" + "version" : "6.72" }, "LWP::UserAgent" : { "file" : "lib/LWP/UserAgent.pm", - "version" : "6.67" + "version" : "6.72" } }, "release_status" : "stable", @@ -218,10 +222,10 @@ "x_IRC" : "irc://irc.perl.org/#lwp", "x_MailingList" : "mailto:libwww@perl.org" }, - "version" : "6.67", + "version" : "6.72", "x_Dist_Zilla" : { "perl" : { - "version" : "5.034001" + "version" : "5.036000" }, "plugins" : [ { @@ -250,7 +254,7 @@ { "class" : "Dist::Zilla::Plugin::MetaConfig", "name" : "MetaConfig", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::MetaProvides::Package", @@ -260,7 +264,7 @@ { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : "MetaProvides::Package/AUTOVIV/:InstallModulesPM", - "version" : "6.025" + "version" : "6.030" } ], "include_underscores" : 0 @@ -282,22 +286,22 @@ { "class" : "Dist::Zilla::Plugin::MetaNoIndex", "name" : "MetaNoIndex", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::MetaYAML", "name" : "MetaYAML", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::MetaJSON", "name" : "MetaJSON", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::MetaResources", "name" : "MetaResources", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::Deprecated", @@ -316,7 +320,7 @@ "class" : "Dist::Zilla::Plugin::Git::Contributors", "config" : { "Dist::Zilla::Plugin::Git::Contributors" : { - "git_version" : "2.36.1", + "git_version" : "2.41.0", "include_authors" : 0, "include_releaser" : 1, "order_by" : "name", @@ -334,12 +338,12 @@ { "class" : "Dist::Zilla::Plugin::Manifest", "name" : "Manifest", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::License", "name" : "License", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::InstallGuide", @@ -355,7 +359,7 @@ { "class" : "Dist::Zilla::Plugin::ExecDir", "name" : "ExecDir", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::Prereqs::FromCPANfile", @@ -363,26 +367,15 @@ "version" : "0.08" }, { - "class" : "Dist::Zilla::Plugin::DynamicPrereqs", - "config" : { - "Dist::Zilla::Role::ModuleMetadata" : { - "Module::Metadata" : "1.000037", - "version" : "0.006" - } - }, - "name" : "DynamicPrereqs", - "version" : "0.040" - }, - { "class" : "Dist::Zilla::Plugin::MakeMaker::Awesome", "config" : { "Dist::Zilla::Plugin::MakeMaker" : { "make_path" : "make", - "version" : "6.025" + "version" : "6.030" }, "Dist::Zilla::Role::TestRunner" : { "default_jobs" : "8", - "version" : "6.025" + "version" : "6.030" } }, "name" : "MakeMaker::Awesome", @@ -401,7 +394,7 @@ { "class" : "Dist::Zilla::Plugin::Test::ReportPrereqs", "name" : "Test::ReportPrereqs", - "version" : "0.028" + "version" : "0.029" }, { "class" : "Dist::Zilla::Plugin::Test::Compile", @@ -429,7 +422,7 @@ { "class" : "Dist::Zilla::Plugin::Substitute", "name" : "00-compile.t", - "version" : "0.006" + "version" : "0.007" }, { "class" : "Dist::Zilla::Plugin::Test::Portability", @@ -439,7 +432,7 @@ } }, "name" : "Test::Portability", - "version" : "2.001000" + "version" : "2.001001" }, { "class" : "Dist::Zilla::Plugin::Test::EOL", @@ -465,7 +458,7 @@ { "class" : "Dist::Zilla::Plugin::Substitute", "name" : "changes_has_content.t", - "version" : "0.006" + "version" : "0.007" }, { "class" : "Dist::Zilla::Plugin::Test::MinimumVersion", @@ -480,7 +473,7 @@ { "class" : "Dist::Zilla::Plugin::PodSyntaxTests", "name" : "PodSyntaxTests", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::Test::Pod::Coverage::Configurable", @@ -610,6 +603,7 @@ "erik", "getprint", "getstore", + "instantiation", "peterm", "shildreth" ], @@ -631,7 +625,7 @@ "changelog" : "Changes" }, "Dist::Zilla::Role::Git::Repo" : { - "git_version" : "2.36.1", + "git_version" : "2.41.0", "repo_root" : "." } }, @@ -666,12 +660,12 @@ { "class" : "Dist::Zilla::Plugin::TestRelease", "name" : "TestRelease", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::UploadToCPAN", "name" : "UploadToCPAN", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::ReadmeAnyFromPod", @@ -706,7 +700,7 @@ } }, "name" : "@Git::VersionManager/pluginbundle version", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::RewriteVersion::Transitional", @@ -762,7 +756,7 @@ "changelog" : "Changes" }, "Dist::Zilla::Role::Git::Repo" : { - "git_version" : "2.36.1", + "git_version" : "2.41.0", "repo_root" : "." }, "Dist::Zilla::Role::Git::StringFormatter" : { @@ -779,12 +773,12 @@ "branch" : null, "changelog" : "Changes", "signed" : 0, - "tag" : "v6.67", + "tag" : "v6.72", "tag_format" : "v%V", "tag_message" : "v%V" }, "Dist::Zilla::Role::Git::Repo" : { - "git_version" : "2.36.1", + "git_version" : "2.41.0", "repo_root" : "." }, "Dist::Zilla::Role::Git::StringFormatter" : { @@ -813,7 +807,7 @@ { "class" : "Dist::Zilla::Plugin::NextRelease", "name" : "@Git::VersionManager/NextRelease", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::Git::Commit", @@ -835,7 +829,7 @@ "changelog" : "Changes" }, "Dist::Zilla::Role::Git::Repo" : { - "git_version" : "2.36.1", + "git_version" : "2.41.0", "repo_root" : "." }, "Dist::Zilla::Role::Git::StringFormatter" : { @@ -855,7 +849,7 @@ "remotes_must_exist" : 1 }, "Dist::Zilla::Role::Git::Repo" : { - "git_version" : "2.36.1", + "git_version" : "2.41.0", "repo_root" : "." } }, @@ -865,62 +859,62 @@ { "class" : "Dist::Zilla::Plugin::ConfirmRelease", "name" : "ConfirmRelease", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":InstallModules", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":IncModules", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":TestFiles", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ExtraTestFiles", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ExecFiles", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":PerlExecFiles", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ShareFiles", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":MainModule", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":AllFiles", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":NoFiles", - "version" : "6.025" + "version" : "6.030" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : "MetaProvides::Package/AUTOVIV/:InstallModulesPM", - "version" : "6.025" + "version" : "6.030" } ], "zilla" : { @@ -928,7 +922,7 @@ "config" : { "is_trial" : 0 }, - "version" : "6.025" + "version" : "6.030" } }, "x_contributors" : [ @@ -946,6 +940,7 @@ "Bill Mann ", "Bron Gondwana ", "Bryan Cardillo ", + "Burak Gursoy ", "Chase Whitener ", "Christopher J. Madsen ", "Colin Newell ", @@ -957,6 +952,7 @@ "David Steinbrunner ", "Desmond Daignault ", "Doug Bell ", + "Eric Johnson ", "Fabian Zeindler ", "Father Chrysostomos ", "Frank Maas ", @@ -982,6 +978,8 @@ "john9art ", "John Wittkoski ", "Jonathan Dahan ", + "Julien Fiegehenn ", + "Kacper Gutowski ", "Karen Etheridge ", "Katarina Durechova ", "leedo ", @@ -1015,7 +1013,6 @@ "Sebastian Paaske T\u00f8rholm ", "Sergey Romanov ", "Shoichi Kaji ", - "simbabque ", "Slaven Rezic ", "Slaven Rezic ", "Spiros Denaxas ", @@ -1039,8 +1036,8 @@ "Yves Orton ", "Zefram " ], - "x_generated_by_perl" : "v5.34.1", - "x_serialization_backend" : "Cpanel::JSON::XS version 4.27", + "x_generated_by_perl" : "v5.36.0", + "x_serialization_backend" : "Cpanel::JSON::XS version 4.36", "x_spdx_expression" : "Artistic-1.0-Perl OR GPL-1.0-or-later" } diff --git a/META.yml b/META.yml index 0104b3c..f25b9b0 100644 --- a/META.yml +++ b/META.yml @@ -12,13 +12,11 @@ build_requires: Test::Needs: '0' Test::RequiresInternet: '0' configure_requires: - CPAN::Meta::Requirements: '2.120620' ExtUtils::MakeMaker: '0' File::Copy: '0' Getopt::Long: '0' - Module::Metadata: '0' -dynamic_config: 1 -generated_by: 'Dist::Zilla version 6.025, CPAN::Meta::Converter version 2.150010' +dynamic_config: 0 +generated_by: 'Dist::Zilla version 6.030, CPAN::Meta::Converter version 2.150010' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -31,74 +29,74 @@ no_index: provides: LWP: file: lib/LWP.pm - version: '6.67' + version: '6.72' LWP::Authen::Basic: file: lib/LWP/Authen/Basic.pm - version: '6.67' + version: '6.72' LWP::Authen::Digest: file: lib/LWP/Authen/Digest.pm - version: '6.67' + version: '6.72' LWP::Authen::Ntlm: file: lib/LWP/Authen/Ntlm.pm - version: '6.67' + version: '6.72' LWP::ConnCache: file: lib/LWP/ConnCache.pm - version: '6.67' + version: '6.72' LWP::Debug: file: lib/LWP/Debug.pm - version: '6.67' + version: '6.72' x_deprecated: 1 LWP::Debug::TraceHTTP: file: lib/LWP/Debug/TraceHTTP.pm - version: '6.67' + version: '6.72' LWP::DebugFile: file: lib/LWP/DebugFile.pm - version: '6.67' + version: '6.72' LWP::MemberMixin: file: lib/LWP/MemberMixin.pm - version: '6.67' + version: '6.72' LWP::Protocol: file: lib/LWP/Protocol.pm - version: '6.67' + version: '6.72' LWP::Protocol::cpan: file: lib/LWP/Protocol/cpan.pm - version: '6.67' + version: '6.72' LWP::Protocol::data: file: lib/LWP/Protocol/data.pm - version: '6.67' + version: '6.72' LWP::Protocol::file: file: lib/LWP/Protocol/file.pm - version: '6.67' + version: '6.72' LWP::Protocol::ftp: file: lib/LWP/Protocol/ftp.pm - version: '6.67' + version: '6.72' LWP::Protocol::gopher: file: lib/LWP/Protocol/gopher.pm - version: '6.67' + version: '6.72' LWP::Protocol::http: file: lib/LWP/Protocol/http.pm - version: '6.67' + version: '6.72' LWP::Protocol::loopback: file: lib/LWP/Protocol/loopback.pm - version: '6.67' + version: '6.72' LWP::Protocol::mailto: file: lib/LWP/Protocol/mailto.pm - version: '6.67' + version: '6.72' LWP::Protocol::nntp: file: lib/LWP/Protocol/nntp.pm - version: '6.67' + version: '6.72' LWP::Protocol::nogo: file: lib/LWP/Protocol/nogo.pm - version: '6.67' + version: '6.72' LWP::RobotUA: file: lib/LWP/RobotUA.pm - version: '6.67' + version: '6.72' LWP::Simple: file: lib/LWP/Simple.pm - version: '6.67' + version: '6.72' LWP::UserAgent: file: lib/LWP/UserAgent.pm - version: '6.67' + version: '6.72' requires: Digest::MD5: '0' Encode: '2.12' @@ -108,18 +106,20 @@ requires: File::Temp: '0' Getopt::Long: '0' HTML::Entities: '0' - HTML::HeadParser: '0' + HTML::HeadParser: '3.71' + HTTP::CookieJar::LWP: '0' HTTP::Cookies: '6' HTTP::Date: '6' HTTP::Negotiate: '6' - HTTP::Request: '6' - HTTP::Request::Common: '6' - HTTP::Response: '6' - HTTP::Status: '6.07' + HTTP::Request: '6.18' + HTTP::Request::Common: '6.18' + HTTP::Response: '6.18' + HTTP::Status: '6.18' IO::Select: '0' IO::Socket: '0' LWP::MediaTypes: '6' MIME::Base64: '2.1' + Module::Load: '0' Net::FTP: '2.58' Net::HTTP: '6.18' Scalar::Util: '0' @@ -137,10 +137,10 @@ resources: bugtracker: https://github.com/libwww-perl/libwww-perl/issues homepage: https://github.com/libwww-perl/libwww-perl repository: https://github.com/libwww-perl/libwww-perl.git -version: '6.67' +version: '6.72' x_Dist_Zilla: perl: - version: '5.034001' + version: '5.036000' plugins: - class: Dist::Zilla::Plugin::Git::GatherDir @@ -163,7 +163,7 @@ x_Dist_Zilla: - class: Dist::Zilla::Plugin::MetaConfig name: MetaConfig - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::MetaProvides::Package config: @@ -172,13 +172,13 @@ x_Dist_Zilla: - class: Dist::Zilla::Plugin::FinderCode name: MetaProvides::Package/AUTOVIV/:InstallModulesPM - version: '6.025' + version: '6.030' include_underscores: 0 Dist::Zilla::Role::MetaProvider::Provider: $Dist::Zilla::Role::MetaProvider::Provider::VERSION: '2.002004' - inherit_missing: '1' - inherit_version: '1' - meta_noindex: '1' + inherit_missing: 1 + inherit_version: 1 + meta_noindex: 1 Dist::Zilla::Role::ModuleMetadata: Module::Metadata: '1.000037' version: '0.006' @@ -187,19 +187,19 @@ x_Dist_Zilla: - class: Dist::Zilla::Plugin::MetaNoIndex name: MetaNoIndex - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::MetaYAML name: MetaYAML - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::MetaJSON name: MetaJSON - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::MetaResources name: MetaResources - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::Deprecated config: @@ -213,7 +213,7 @@ x_Dist_Zilla: class: Dist::Zilla::Plugin::Git::Contributors config: Dist::Zilla::Plugin::Git::Contributors: - git_version: 2.36.1 + git_version: 2.41.0 include_authors: 0 include_releaser: 1 order_by: name @@ -227,11 +227,11 @@ x_Dist_Zilla: - class: Dist::Zilla::Plugin::Manifest name: Manifest - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::License name: License - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::InstallGuide config: @@ -243,28 +243,20 @@ x_Dist_Zilla: - class: Dist::Zilla::Plugin::ExecDir name: ExecDir - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::Prereqs::FromCPANfile name: Prereqs::FromCPANfile version: '0.08' - - class: Dist::Zilla::Plugin::DynamicPrereqs - config: - Dist::Zilla::Role::ModuleMetadata: - Module::Metadata: '1.000037' - version: '0.006' - name: DynamicPrereqs - version: '0.040' - - class: Dist::Zilla::Plugin::MakeMaker::Awesome config: Dist::Zilla::Plugin::MakeMaker: make_path: make - version: '6.025' + version: '6.030' Dist::Zilla::Role::TestRunner: default_jobs: '8' - version: '6.025' + version: '6.030' name: MakeMaker::Awesome version: '0.49' - @@ -278,7 +270,7 @@ x_Dist_Zilla: - class: Dist::Zilla::Plugin::Test::ReportPrereqs name: Test::ReportPrereqs - version: '0.028' + version: '0.029' - class: Dist::Zilla::Plugin::Test::Compile config: @@ -300,14 +292,14 @@ x_Dist_Zilla: - class: Dist::Zilla::Plugin::Substitute name: 00-compile.t - version: '0.006' + version: '0.007' - class: Dist::Zilla::Plugin::Test::Portability config: Dist::Zilla::Plugin::Test::Portability: options: '' name: Test::Portability - version: '2.001000' + version: '2.001001' - class: Dist::Zilla::Plugin::Test::EOL config: @@ -327,7 +319,7 @@ x_Dist_Zilla: - class: Dist::Zilla::Plugin::Substitute name: changes_has_content.t - version: '0.006' + version: '0.007' - class: Dist::Zilla::Plugin::Test::MinimumVersion config: @@ -338,7 +330,7 @@ x_Dist_Zilla: - class: Dist::Zilla::Plugin::PodSyntaxTests name: PodSyntaxTests - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::Test::Pod::Coverage::Configurable name: Test::Pod::Coverage::Configurable @@ -465,6 +457,7 @@ x_Dist_Zilla: - erik - getprint - getstore + - instantiation - peterm - shildreth wordlist: Pod::Wordlist @@ -480,7 +473,7 @@ x_Dist_Zilla: allow_dirty_match: [] changelog: Changes Dist::Zilla::Role::Git::Repo: - git_version: 2.36.1 + git_version: 2.41.0 repo_root: . name: Git::Check version: '2.048' @@ -506,11 +499,11 @@ x_Dist_Zilla: - class: Dist::Zilla::Plugin::TestRelease name: TestRelease - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::UploadToCPAN name: UploadToCPAN - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::ReadmeAnyFromPod config: @@ -535,7 +528,7 @@ x_Dist_Zilla: phase: develop type: recommends name: '@Git::VersionManager/pluginbundle version' - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::RewriteVersion::Transitional config: @@ -568,7 +561,7 @@ x_Dist_Zilla: Dist::Zilla::Plugin::Git::Commit: add_files_in: [] commit_msg: v%V%n%n%c - signoff: '0' + signoff: 0 Dist::Zilla::Role::Git::DirtyFiles: allow_dirty: - Changes @@ -578,7 +571,7 @@ x_Dist_Zilla: allow_dirty_match: [] changelog: Changes Dist::Zilla::Role::Git::Repo: - git_version: 2.36.1 + git_version: 2.41.0 repo_root: . Dist::Zilla::Role::Git::StringFormatter: time_zone: local @@ -591,11 +584,11 @@ x_Dist_Zilla: branch: ~ changelog: Changes signed: 0 - tag: v6.67 + tag: v6.72 tag_format: v%V tag_message: v%V Dist::Zilla::Role::Git::Repo: - git_version: 2.36.1 + git_version: 2.41.0 repo_root: . Dist::Zilla::Role::Git::StringFormatter: time_zone: local @@ -616,14 +609,14 @@ x_Dist_Zilla: - class: Dist::Zilla::Plugin::NextRelease name: '@Git::VersionManager/NextRelease' - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::Git::Commit config: Dist::Zilla::Plugin::Git::Commit: add_files_in: [] commit_msg: 'increment $VERSION after %v release' - signoff: '0' + signoff: 0 Dist::Zilla::Role::Git::DirtyFiles: allow_dirty: - Build.PL @@ -633,7 +626,7 @@ x_Dist_Zilla: - (?^:^lib/.*\.pm$) changelog: Changes Dist::Zilla::Role::Git::Repo: - git_version: 2.36.1 + git_version: 2.41.0 repo_root: . Dist::Zilla::Role::Git::StringFormatter: time_zone: local @@ -647,63 +640,63 @@ x_Dist_Zilla: - origin remotes_must_exist: 1 Dist::Zilla::Role::Git::Repo: - git_version: 2.36.1 + git_version: 2.41.0 repo_root: . name: Git::Push version: '2.048' - class: Dist::Zilla::Plugin::ConfirmRelease name: ConfirmRelease - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::FinderCode name: ':InstallModules' - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::FinderCode name: ':IncModules' - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::FinderCode name: ':TestFiles' - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::FinderCode name: ':ExtraTestFiles' - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::FinderCode name: ':ExecFiles' - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::FinderCode name: ':PerlExecFiles' - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::FinderCode name: ':ShareFiles' - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::FinderCode name: ':MainModule' - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::FinderCode name: ':AllFiles' - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::FinderCode name: ':NoFiles' - version: '6.025' + version: '6.030' - class: Dist::Zilla::Plugin::FinderCode name: MetaProvides::Package/AUTOVIV/:InstallModulesPM - version: '6.025' + version: '6.030' zilla: class: Dist::Zilla::Dist::Builder config: - is_trial: '0' - version: '6.025' + is_trial: 0 + version: '6.030' x_contributors: - 'Adam Kennedy ' - 'Adam Sjogren ' @@ -719,6 +712,7 @@ x_contributors: - 'Bill Mann ' - 'Bron Gondwana ' - 'Bryan Cardillo ' + - 'Burak Gursoy ' - 'Chase Whitener ' - 'Christopher J. Madsen ' - 'Colin Newell ' @@ -730,6 +724,7 @@ x_contributors: - 'David Steinbrunner ' - 'Desmond Daignault ' - 'Doug Bell ' + - 'Eric Johnson ' - 'Fabian Zeindler ' - 'Father Chrysostomos ' - 'Frank Maas ' @@ -755,6 +750,8 @@ x_contributors: - 'john9art ' - 'John Wittkoski ' - 'Jonathan Dahan ' + - 'Julien Fiegehenn ' + - 'Kacper Gutowski ' - 'Karen Etheridge ' - 'Katarina Durechova ' - 'leedo ' @@ -788,7 +785,6 @@ x_contributors: - 'Sebastian Paaske Tørholm ' - 'Sergey Romanov ' - 'Shoichi Kaji ' - - 'simbabque ' - 'Slaven Rezic ' - 'Slaven Rezic ' - 'Spiros Denaxas ' @@ -811,6 +807,6 @@ x_contributors: - 'Yury Zavarin ' - 'Yves Orton ' - 'Zefram ' -x_generated_by_perl: v5.34.1 -x_serialization_backend: 'YAML::Tiny version 1.73' +x_generated_by_perl: v5.36.0 +x_serialization_backend: 'YAML::Tiny version 1.74' x_spdx_expression: 'Artistic-1.0-Perl OR GPL-1.0-or-later' diff --git a/Makefile.PL b/Makefile.PL index 165ede0..adcf3cf 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -31,11 +31,9 @@ my %WriteMakefileArgs = ( "ABSTRACT" => "The World-Wide Web library for Perl", "AUTHOR" => "Gisle Aas ", "CONFIGURE_REQUIRES" => { - "CPAN::Meta::Requirements" => "2.120620", "ExtUtils::MakeMaker" => 0, "File::Copy" => 0, - "Getopt::Long" => 0, - "Module::Metadata" => 0 + "Getopt::Long" => 0 }, "DISTNAME" => "libwww-perl", "EXE_FILES" => [ @@ -56,18 +54,20 @@ my %WriteMakefileArgs = ( "File::Temp" => 0, "Getopt::Long" => 0, "HTML::Entities" => 0, - "HTML::HeadParser" => 0, + "HTML::HeadParser" => "3.71", + "HTTP::CookieJar::LWP" => 0, "HTTP::Cookies" => 6, "HTTP::Date" => 6, "HTTP::Negotiate" => 6, - "HTTP::Request" => 6, - "HTTP::Request::Common" => 6, - "HTTP::Response" => 6, - "HTTP::Status" => "6.07", + "HTTP::Request" => "6.18", + "HTTP::Request::Common" => "6.18", + "HTTP::Response" => "6.18", + "HTTP::Status" => "6.18", "IO::Select" => 0, "IO::Socket" => 0, "LWP::MediaTypes" => 6, "MIME::Base64" => "2.1", + "Module::Load" => 0, "Net::FTP" => "2.58", "Net::HTTP" => "6.18", "Scalar::Util" => 0, @@ -89,7 +89,7 @@ my %WriteMakefileArgs = ( "Test::Needs" => 0, "Test::RequiresInternet" => 0 }, - "VERSION" => "6.67", + "VERSION" => "6.72", "test" => { "TESTS" => "t/*.t t/base/*.t t/base/protocols/*.t t/leak/*.t t/local/*.t t/robot/*.t" } @@ -113,19 +113,21 @@ my %FallbackPrereqs = ( "FindBin" => 0, "Getopt::Long" => 0, "HTML::Entities" => 0, - "HTML::HeadParser" => 0, + "HTML::HeadParser" => "3.71", + "HTTP::CookieJar::LWP" => 0, "HTTP::Cookies" => 6, "HTTP::Daemon" => "6.12", "HTTP::Date" => 6, "HTTP::Negotiate" => 6, - "HTTP::Request" => 6, - "HTTP::Request::Common" => 6, - "HTTP::Response" => 6, - "HTTP::Status" => "6.07", + "HTTP::Request" => "6.18", + "HTTP::Request::Common" => "6.18", + "HTTP::Response" => "6.18", + "HTTP::Status" => "6.18", "IO::Select" => 0, "IO::Socket" => 0, "LWP::MediaTypes" => 6, "MIME::Base64" => "2.1", + "Module::Load" => 0, "Net::FTP" => "2.58", "Net::HTTP" => "6.18", "Scalar::Util" => 0, @@ -142,9 +144,6 @@ my %FallbackPrereqs = ( "warnings" => 0 ); -# inserted by Dist::Zilla::Plugin::DynamicPrereqs 0.040 -requires('HTTP::Status', '6.18') if has_module('HTTP::Status', '6.17'); - unless ( eval { ExtUtils::MakeMaker->VERSION('6.63_03') } ) { delete $WriteMakefileArgs{TEST_REQUIRES}; delete $WriteMakefileArgs{BUILD_REQUIRES}; @@ -155,39 +154,3 @@ delete $WriteMakefileArgs{CONFIGURE_REQUIRES} unless eval { ExtUtils::MakeMaker->VERSION(6.52) }; WriteMakefile(%WriteMakefileArgs); - -# inserted by Dist::Zilla::Plugin::DynamicPrereqs 0.040 -sub _add_prereq { - my ($mm_key, $module, $version_or_range) = @_; - $version_or_range ||= 0; - warn "$module already exists in $mm_key (at version $WriteMakefileArgs{$mm_key}{$module}) -- need to do a sane metamerge!" - if exists $WriteMakefileArgs{$mm_key}{$module} - and $WriteMakefileArgs{$mm_key}{$module} ne '0' - and $WriteMakefileArgs{$mm_key}{$module} ne $version_or_range; - warn "$module already exists in FallbackPrereqs (at version $FallbackPrereqs{$module}) -- need to do a sane metamerge!" - if exists $FallbackPrereqs{$module} and $FallbackPrereqs{$module} ne '0' - and $FallbackPrereqs{$module} ne $version_or_range; - $WriteMakefileArgs{$mm_key}{$module} = $FallbackPrereqs{$module} = $version_or_range; - return; -} - -sub has_module { - my ($module, $version_or_range) = @_; - require Module::Metadata; - my $mmd = Module::Metadata->new_from_module($module); - return undef if not $mmd; - return $mmd->version($module) if not defined $version_or_range; - - require CPAN::Meta::Requirements; - my $req = CPAN::Meta::Requirements->new; - $req->add_string_requirement($module => $version_or_range); - return 1 if $req->accepts_module($module => $mmd->version($module)); - return 0; -} - -sub requires { goto &runtime_requires } - -sub runtime_requires { - my ($module, $version_or_range) = @_; - _add_prereq(PREREQ_PM => $module, $version_or_range); -} diff --git a/cpanfile b/cpanfile index 25ce988..eb9b2da 100644 --- a/cpanfile +++ b/cpanfile @@ -20,18 +20,20 @@ on 'runtime' => sub { requires 'File::Temp'; requires 'Getopt::Long'; requires 'HTML::Entities'; - requires 'HTML::HeadParser'; + requires 'HTML::HeadParser' => '3.71'; requires 'HTTP::Cookies' => '6'; + requires 'HTTP::CookieJar::LWP'; requires 'HTTP::Date' => '6'; requires 'HTTP::Negotiate' => '6'; - requires 'HTTP::Request' => '6'; - requires 'HTTP::Request::Common' => '6'; - requires 'HTTP::Response' => '6'; - requires 'HTTP::Status' => '6.07'; + requires 'HTTP::Request' => '6.18'; + requires 'HTTP::Request::Common' => '6.18'; + requires 'HTTP::Response' => '6.18'; + requires 'HTTP::Status' => '6.18'; requires 'IO::Select'; requires 'IO::Socket'; requires 'LWP::MediaTypes' => '6'; requires 'MIME::Base64' => '2.1'; + requires 'Module::Load'; requires 'Net::FTP' => '2.58'; requires 'Net::HTTP' => '6.18'; requires 'Scalar::Util'; @@ -58,6 +60,7 @@ on 'test' => sub { on 'develop' => sub { requires 'Authen::NTLM' => '1.02'; requires 'Pod::Coverage::TrustPod'; + requires 'Pod::Spell' => '1.25'; requires 'Test::EOL' => '2.00'; requires 'Test::LeakTrace' => '0.16'; requires 'Test::MinimumVersion'; diff --git a/dist.ini b/dist.ini index 929f540..e072807 100644 --- a/dist.ini +++ b/dist.ini @@ -38,11 +38,6 @@ user = libwww-perl [Prereqs::FromCPANfile] -[DynamicPrereqs] -:version = 0.039 -; HTTP::Status 6.17 was buggy --body = requires('HTTP::Status', '6.18') if has_module('HTTP::Status', '6.17'); - [MakeMaker::Awesome] :version = 0.27 delimiter = | @@ -231,6 +226,7 @@ stopword = de stopword = erik stopword = getprint stopword = getstore +stopword = instantiation [Git::Check] allow_dirty = diff --git a/lib/LWP.pm b/lib/LWP.pm index 6ac3752..0db4c80 100644 --- a/lib/LWP.pm +++ b/lib/LWP.pm @@ -1,6 +1,6 @@ package LWP; -our $VERSION = '6.67'; +our $VERSION = '6.72'; require LWP::UserAgent; # this should load everything you need diff --git a/lib/LWP/Authen/Basic.pm b/lib/LWP/Authen/Basic.pm index 93289d3..4c25056 100644 --- a/lib/LWP/Authen/Basic.pm +++ b/lib/LWP/Authen/Basic.pm @@ -2,7 +2,7 @@ package LWP::Authen::Basic; use strict; -our $VERSION = '6.67'; +our $VERSION = '6.72'; require Encode; require MIME::Base64; diff --git a/lib/LWP/Authen/Digest.pm b/lib/LWP/Authen/Digest.pm index a6dfbd9..04781b2 100644 --- a/lib/LWP/Authen/Digest.pm +++ b/lib/LWP/Authen/Digest.pm @@ -3,7 +3,7 @@ package LWP::Authen::Digest; use strict; use parent 'LWP::Authen::Basic'; -our $VERSION = '6.67'; +our $VERSION = '6.72'; require Digest::MD5; diff --git a/lib/LWP/Authen/Ntlm.pm b/lib/LWP/Authen/Ntlm.pm index 5cb0473..bf4bf46 100644 --- a/lib/LWP/Authen/Ntlm.pm +++ b/lib/LWP/Authen/Ntlm.pm @@ -2,7 +2,7 @@ package LWP::Authen::Ntlm; use strict; -our $VERSION = '6.67'; +our $VERSION = '6.72'; use Authen::NTLM "1.02"; use MIME::Base64 "2.12"; diff --git a/lib/LWP/ConnCache.pm b/lib/LWP/ConnCache.pm index 542d688..50ead7d 100644 --- a/lib/LWP/ConnCache.pm +++ b/lib/LWP/ConnCache.pm @@ -2,7 +2,7 @@ package LWP::ConnCache; use strict; -our $VERSION = '6.67'; +our $VERSION = '6.72'; our $DEBUG; sub new { diff --git a/lib/LWP/Debug.pm b/lib/LWP/Debug.pm index df55e46..679ea9c 100644 --- a/lib/LWP/Debug.pm +++ b/lib/LWP/Debug.pm @@ -1,6 +1,6 @@ package LWP::Debug; # legacy -our $VERSION = '6.67'; +our $VERSION = '6.72'; require Exporter; our @ISA = qw(Exporter); diff --git a/lib/LWP/Debug/TraceHTTP.pm b/lib/LWP/Debug/TraceHTTP.pm index 74d2267..f8db0b8 100644 --- a/lib/LWP/Debug/TraceHTTP.pm +++ b/lib/LWP/Debug/TraceHTTP.pm @@ -11,7 +11,7 @@ package LWP::Debug::TraceHTTP; use strict; use parent 'LWP::Protocol::http'; -our $VERSION = '6.67'; +our $VERSION = '6.72'; package # hide from PAUSE LWP::Debug::TraceHTTP::Socket; diff --git a/lib/LWP/DebugFile.pm b/lib/LWP/DebugFile.pm index 6eb78b5..834d4d7 100644 --- a/lib/LWP/DebugFile.pm +++ b/lib/LWP/DebugFile.pm @@ -1,6 +1,6 @@ package LWP::DebugFile; -our $VERSION = '6.67'; +our $VERSION = '6.72'; # legacy stub diff --git a/lib/LWP/MemberMixin.pm b/lib/LWP/MemberMixin.pm index 1b14097..1058cfc 100644 --- a/lib/LWP/MemberMixin.pm +++ b/lib/LWP/MemberMixin.pm @@ -1,6 +1,6 @@ package LWP::MemberMixin; -our $VERSION = '6.67'; +our $VERSION = '6.72'; sub _elem { my $self = shift; diff --git a/lib/LWP/Protocol.pm b/lib/LWP/Protocol.pm index d59a69b..8b81139 100644 --- a/lib/LWP/Protocol.pm +++ b/lib/LWP/Protocol.pm @@ -2,7 +2,7 @@ package LWP::Protocol; use parent 'LWP::MemberMixin'; -our $VERSION = '6.67'; +our $VERSION = '6.72'; use strict; use Carp (); @@ -12,6 +12,7 @@ use Scalar::Util qw(openhandle); use Try::Tiny qw(try catch); my %ImplementedBy = (); # scheme => classname +my %ImplementorAlreadyTested; sub new { @@ -49,15 +50,18 @@ sub implementor if ($impclass) { $ImplementedBy{$scheme} = $impclass; } + my $ic = $ImplementedBy{$scheme}; - return $ic if $ic; + # module does not exist + return $ic if $ic || $ImplementorAlreadyTested{$scheme}; return '' unless $scheme =~ /^([.+\-\w]+)$/; # check valid URL schemes $scheme = $1; # untaint - $scheme =~ tr/.+-/_/; # make it a legal module name # scheme not yet known, look for a 'use'd implementation - $ic = "LWP::Protocol::$scheme"; # default location + $ic = $scheme; + $ic =~ tr/.+-/_/; # make it a legal module name + $ic = "LWP::Protocol::$ic"; # default location $ic = "LWP::Protocol::nntp" if $scheme eq 'news'; #XXX ugly hack no strict 'refs'; # check we actually have one for the scheme: @@ -79,6 +83,7 @@ sub implementor }; } $ImplementedBy{$scheme} = $ic if $ic; + $ImplementorAlreadyTested{$scheme} = 1; $ic; } diff --git a/lib/LWP/Protocol/cpan.pm b/lib/LWP/Protocol/cpan.pm index 8cc7bfd..ec5701b 100644 --- a/lib/LWP/Protocol/cpan.pm +++ b/lib/LWP/Protocol/cpan.pm @@ -4,7 +4,7 @@ use strict; use parent qw(LWP::Protocol); -our $VERSION = '6.67'; +our $VERSION = '6.72'; require URI; require HTTP::Status; diff --git a/lib/LWP/Protocol/data.pm b/lib/LWP/Protocol/data.pm index f1fc3c0..3776668 100644 --- a/lib/LWP/Protocol/data.pm +++ b/lib/LWP/Protocol/data.pm @@ -4,7 +4,7 @@ package LWP::Protocol::data; use strict; -our $VERSION = '6.67'; +our $VERSION = '6.72'; require HTTP::Response; require HTTP::Status; diff --git a/lib/LWP/Protocol/file.pm b/lib/LWP/Protocol/file.pm index d2436ac..4120dd4 100644 --- a/lib/LWP/Protocol/file.pm +++ b/lib/LWP/Protocol/file.pm @@ -4,7 +4,7 @@ use parent qw(LWP::Protocol); use strict; -our $VERSION = '6.67'; +our $VERSION = '6.72'; require LWP::MediaTypes; require HTTP::Request; diff --git a/lib/LWP/Protocol/ftp.pm b/lib/LWP/Protocol/ftp.pm index f1929cb..8c33f8b 100644 --- a/lib/LWP/Protocol/ftp.pm +++ b/lib/LWP/Protocol/ftp.pm @@ -5,7 +5,7 @@ package LWP::Protocol::ftp; use parent qw(LWP::Protocol); use strict; -our $VERSION = '6.67'; +our $VERSION = '6.72'; use Carp (); use HTTP::Status (); diff --git a/lib/LWP/Protocol/gopher.pm b/lib/LWP/Protocol/gopher.pm index 1233c7d..27d8ca9 100644 --- a/lib/LWP/Protocol/gopher.pm +++ b/lib/LWP/Protocol/gopher.pm @@ -9,7 +9,7 @@ package LWP::Protocol::gopher; use strict; -our $VERSION = '6.67'; +our $VERSION = '6.72'; require HTTP::Response; require HTTP::Status; diff --git a/lib/LWP/Protocol/http.pm b/lib/LWP/Protocol/http.pm index b135a17..4b39083 100644 --- a/lib/LWP/Protocol/http.pm +++ b/lib/LWP/Protocol/http.pm @@ -2,7 +2,7 @@ package LWP::Protocol::http; use strict; -our $VERSION = '6.67'; +our $VERSION = '6.72'; require HTTP::Response; require HTTP::Status; diff --git a/lib/LWP/Protocol/loopback.pm b/lib/LWP/Protocol/loopback.pm index d87decb..26582e5 100644 --- a/lib/LWP/Protocol/loopback.pm +++ b/lib/LWP/Protocol/loopback.pm @@ -2,7 +2,7 @@ package LWP::Protocol::loopback; use strict; -our $VERSION = '6.67'; +our $VERSION = '6.72'; require HTTP::Response; diff --git a/lib/LWP/Protocol/mailto.pm b/lib/LWP/Protocol/mailto.pm index 137151a..56923c4 100644 --- a/lib/LWP/Protocol/mailto.pm +++ b/lib/LWP/Protocol/mailto.pm @@ -11,7 +11,7 @@ require HTTP::Status; use Carp; use strict; -our $VERSION = '6.67'; +our $VERSION = '6.72'; use parent qw(LWP::Protocol); our $SENDMAIL; diff --git a/lib/LWP/Protocol/nntp.pm b/lib/LWP/Protocol/nntp.pm index 8d92051..2707fc6 100644 --- a/lib/LWP/Protocol/nntp.pm +++ b/lib/LWP/Protocol/nntp.pm @@ -4,7 +4,7 @@ package LWP::Protocol::nntp; use parent qw(LWP::Protocol); -our $VERSION = '6.67'; +our $VERSION = '6.72'; require HTTP::Response; require HTTP::Status; diff --git a/lib/LWP/Protocol/nogo.pm b/lib/LWP/Protocol/nogo.pm index a5ecbe1..7527b3e 100644 --- a/lib/LWP/Protocol/nogo.pm +++ b/lib/LWP/Protocol/nogo.pm @@ -7,7 +7,7 @@ package LWP::Protocol::nogo; use strict; -our $VERSION = '6.67'; +our $VERSION = '6.72'; require HTTP::Response; require HTTP::Status; diff --git a/lib/LWP/RobotUA.pm b/lib/LWP/RobotUA.pm index d2fe842..2b913eb 100644 --- a/lib/LWP/RobotUA.pm +++ b/lib/LWP/RobotUA.pm @@ -2,7 +2,7 @@ package LWP::RobotUA; use parent qw(LWP::UserAgent); -our $VERSION = '6.67'; +our $VERSION = '6.72'; require WWW::RobotRules; require HTTP::Request; diff --git a/lib/LWP/Simple.pm b/lib/LWP/Simple.pm index d1acb02..d237d53 100644 --- a/lib/LWP/Simple.pm +++ b/lib/LWP/Simple.pm @@ -2,7 +2,7 @@ package LWP::Simple; use strict; -our $VERSION = '6.67'; +our $VERSION = '6.72'; require Exporter; diff --git a/lib/LWP/UserAgent.pm b/lib/LWP/UserAgent.pm index b4eb428..c8d1a25 100644 --- a/lib/LWP/UserAgent.pm +++ b/lib/LWP/UserAgent.pm @@ -13,11 +13,12 @@ use HTTP::Date (); use LWP (); use HTTP::Status (); use LWP::Protocol (); +use Module::Load qw( load ); use Scalar::Util qw(blessed openhandle); use Try::Tiny qw(try catch); -our $VERSION = '6.67'; +our $VERSION = '6.72'; sub new { @@ -86,6 +87,10 @@ sub new $requests_redirectable = ['GET', 'HEAD'] unless defined $requests_redirectable; + my $cookie_jar_class = delete $cnf{cookie_jar_class}; + $cookie_jar_class = 'HTTP::Cookies' + unless defined $cookie_jar_class; + # Actually ""s are just as good as 0's, but for concision we'll just say: Carp::croak("protocols_allowed has to be an arrayref or 0, not \"$protocols_allowed\"!") if $protocols_allowed and ref($protocols_allowed) ne 'ARRAY'; @@ -114,6 +119,7 @@ sub new protocols_forbidden => $protocols_forbidden, requests_redirectable => $requests_redirectable, send_te => $send_te, + cookie_jar_class => $cookie_jar_class, }, $class; $self->agent(defined($agent) ? $agent : $class->_agent) @@ -712,7 +718,21 @@ sub get_basic_credentials } -sub timeout { shift->_elem('timeout', @_); } +sub timeout +{ + my $self = shift; + my $old = $self->{timeout}; + if (@_) { + $self->{timeout} = shift; + if (my $conn_cache = $self->conn_cache) { + for my $conn ($conn_cache->get_connections) { + $conn->timeout($self->{timeout}); + } + } + } + return $old; +} + sub local_address{ shift->_elem('local_address',@_); } sub max_size { shift->_elem('max_size', @_); } sub max_redirect { shift->_elem('max_redirect', @_); } @@ -784,24 +804,38 @@ sub parse_head { sub cookie_jar { my $self = shift; my $old = $self->{cookie_jar}; - if (@_) { - my $jar = shift; - if (ref($jar) eq "HASH") { - require HTTP::Cookies; - $jar = HTTP::Cookies->new(%$jar); - } - $self->{cookie_jar} = $jar; - $self->set_my_handler("request_prepare", - $jar ? sub { - return if $_[0]->header("Cookie"); - $jar->add_cookie_header($_[0]); - } : undef, - ); - $self->set_my_handler("response_done", - $jar ? sub { $jar->extract_cookies($_[0]); } : undef, - ); + + return $old unless @_; + + my $jar = shift; + if (ref($jar) eq "HASH") { + my $class = $self->{cookie_jar_class}; + try { + load($class); + $jar = $class->new(%$jar); + } + catch { + my $error = $_; + if ($error =~ /Can't locate/) { + die "cookie_jar_class '$class' not found\n"; + } + else { + die "$error\n"; + } + }; } - $old; + $self->{cookie_jar} = $jar; + $self->set_my_handler("request_prepare", + $jar ? sub { + return if $_[0]->header("Cookie"); + $jar->add_cookie_header($_[0]); + } : undef, + ); + $self->set_my_handler("response_done", + $jar ? sub { $jar->extract_cookies($_[0]); } : undef, + ); + + return $old; } sub default_headers { @@ -845,16 +879,21 @@ sub from { # legacy sub conn_cache { my $self = shift; - my $old = $self->{conn_cache}; + my $old = $self->{conn_cache}; if (@_) { - my $cache = shift; - if (ref($cache) eq "HASH") { - require LWP::ConnCache; - $cache = LWP::ConnCache->new(%$cache); - } - $self->{conn_cache} = $cache; + my $cache = shift; + if ( ref($cache) eq "HASH" ) { + require LWP::ConnCache; + $cache = LWP::ConnCache->new(%$cache); + } + elsif ( defined $cache) { + for my $conn ( $cache->get_connections ) { + $conn->timeout( $self->timeout ); + } + } + $self->{conn_cache} = $cache; } - $old; + return $old; } @@ -1073,7 +1112,7 @@ sub _need_proxy { if ($ua->{no_proxy}) { if (my $host = eval { $req->uri->host }) { for my $domain (@{$ua->{no_proxy}}) { - if ($host =~ /\Q$domain\E$/) { + if ($host =~ /(?:^|\.)\Q$domain\E$/) { return; } } @@ -1284,6 +1323,7 @@ The following options correspond to attribute methods described below: agent "libwww-perl/#.###" conn_cache undef cookie_jar undef + cookie_jar_class HTTP::Cookies default_headers HTTP::Headers->new from undef local_address undef @@ -1293,8 +1333,10 @@ The following options correspond to attribute methods described below: parse_head 1 protocols_allowed undef protocols_forbidden undef - proxy undef + proxy {} requests_redirectable ['GET', 'HEAD'] + send_te 1 + show_progress undef ssl_opts { verify_hostname => 1 } timeout 180 @@ -1372,9 +1414,9 @@ instead. See L for more information. The default is to have no cookie jar, i.e. never automatically add C headers to the requests. -Shortcut: If a reference to a plain hash is passed in, it is replaced with an -instance of L that is initialized based on the hash. This form -also automatically loads the L module. It means that: +If C<$jar> contains an unblessed hash reference, a new cookie jar object is +created for you automatically. The object is of the class set with the +C constructor argument, which defaults to L. $ua->cookie_jar({ file => "$ENV{HOME}/.cookies.txt" }); @@ -1383,6 +1425,20 @@ is really just a shortcut for: require HTTP::Cookies; $ua->cookie_jar(HTTP::Cookies->new(file => "$ENV{HOME}/.cookies.txt")); +As described above and in L, you should set +C to C<"HTTP::CookieJar::LWP"> to get a safer cookie jar. + + my $ua = LWP::UserAgent->new( cookie_jar_class => 'HTTP::CookieJar::LWP' ); + $ua->cookie_jar({}); # HTTP::CookieJar::LWP takes no args + +These can also be combined into the constructor, so a jar is created at +instantiation. + + my $ua = LWP::UserAgent->new( + cookie_jar_class => 'HTTP::CookieJar::LWP', + cookie_jar => {}, + ); + =head2 credentials my $creds = $ua->credentials(); diff --git a/perlimports.toml b/perlimports.toml new file mode 100644 index 0000000..bded6f7 --- /dev/null +++ b/perlimports.toml @@ -0,0 +1,25 @@ +# Valid log levels are: +# debug, info, notice, warning, error, critical, alert, emergency +# critical, alert and emergency are not currently used. +# +# Please use boolean values in this config file. Negated options (--no-*) are +# not permitted here. Explicitly set options to true or false. +# +# Some of these values deviate from the regular perlimports defaults. In +# particular, you're encouraged to leave preserve_duplicates and +# preserve_unused disabled. + +cache = false # setting this to true is currently discouraged +ignore_modules = ["Test::More"] +ignore_modules_filename = "" +ignore_modules_pattern = "" # regex like "^(Foo|Foo::Bar)" +ignore_modules_pattern_filename = "" +libs = ["lib", "t/lib"] +log_filename = "" +log_level = "warn" +never_export_modules = [] +never_export_modules_filename = "" +padding = true +preserve_duplicates = false +preserve_unused = false +tidy_whitespace = true diff --git a/t/00-report-prereqs.dd b/t/00-report-prereqs.dd index cf92342..1913b65 100644 --- a/t/00-report-prereqs.dd +++ b/t/00-report-prereqs.dd @@ -1,11 +1,12 @@ do { my $x = { 'configure' => { 'requires' => { - 'CPAN::Meta::Requirements' => '2.120620', 'ExtUtils::MakeMaker' => '0', 'File::Copy' => '0', - 'Getopt::Long' => '0', - 'Module::Metadata' => '0' + 'Getopt::Long' => '0' + }, + 'suggests' => { + 'JSON::PP' => '2.27300' } }, 'develop' => { @@ -18,6 +19,7 @@ do { my $x = { 'IO::Handle' => '0', 'IPC::Open3' => '0', 'Pod::Coverage::TrustPod' => '0', + 'Pod::Spell' => '1.25', 'Test::EOL' => '2.00', 'Test::LeakTrace' => '0.16', 'Test::MinimumVersion' => '0', @@ -40,18 +42,20 @@ do { my $x = { 'File::Temp' => '0', 'Getopt::Long' => '0', 'HTML::Entities' => '0', - 'HTML::HeadParser' => '0', + 'HTML::HeadParser' => '3.71', + 'HTTP::CookieJar::LWP' => '0', 'HTTP::Cookies' => '6', 'HTTP::Date' => '6', 'HTTP::Negotiate' => '6', - 'HTTP::Request' => '6', - 'HTTP::Request::Common' => '6', - 'HTTP::Response' => '6', - 'HTTP::Status' => '6.07', + 'HTTP::Request' => '6.18', + 'HTTP::Request::Common' => '6.18', + 'HTTP::Response' => '6.18', + 'HTTP::Status' => '6.18', 'IO::Select' => '0', 'IO::Socket' => '0', 'LWP::MediaTypes' => '6', 'MIME::Base64' => '2.1', + 'Module::Load' => '0', 'Net::FTP' => '2.58', 'Net::HTTP' => '6.18', 'Scalar::Util' => '0', diff --git a/t/00-report-prereqs.t b/t/00-report-prereqs.t index c3a94ca..5696476 100644 --- a/t/00-report-prereqs.t +++ b/t/00-report-prereqs.t @@ -3,7 +3,7 @@ use strict; use warnings; -# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.028 +# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.029 use Test::More tests => 1; @@ -109,20 +109,24 @@ for my $phase ( qw(configure build test runtime develop other) ) { my @reports = [qw/Module Want Have/]; for my $mod ( sort keys %{ $req_hash->{$phase}{$type} } ) { - next if $mod eq 'perl'; next if grep { $_ eq $mod } @exclude; - my $file = $mod; - $file =~ s{::}{/}g; - $file .= ".pm"; - my ($prefix) = grep { -e File::Spec->catfile($_, $file) } @INC; - my $want = $req_hash->{$phase}{$type}{$mod}; $want = "undef" unless defined $want; $want = "any" if !$want && $want == 0; + if ($mod eq 'perl') { + push @reports, ['perl', $want, $]]; + next; + } + my $req_string = $want eq 'any' ? 'any version required' : "version '$want' required"; + my $file = $mod; + $file =~ s{::}{/}g; + $file .= ".pm"; + my ($prefix) = grep { -e File::Spec->catfile($_, $file) } @INC; + if ($prefix) { my $have = MM->parse_version( File::Spec->catfile($prefix, $file) ); $have = "undef" unless defined $have; diff --git a/t/10-attrs.t b/t/10-attrs.t index 0567266..c7c28c7 100644 --- a/t/10-attrs.t +++ b/t/10-attrs.t @@ -2,7 +2,7 @@ use strict; use warnings; use Test::More; -use LWP::UserAgent; +use LWP::UserAgent (); plan tests => 9; # Prevent environment from interfering with test: diff --git a/t/base/default_content_type.t b/t/base/default_content_type.t index d446ed6..97cd736 100644 --- a/t/base/default_content_type.t +++ b/t/base/default_content_type.t @@ -2,7 +2,7 @@ use strict; use warnings; use Test::More; -use LWP::UserAgent; +use LWP::UserAgent (); use HTTP::Request (); plan tests => 18; @@ -14,17 +14,6 @@ delete $ENV{PERL_LWP_SSL_CA_FILE}; delete $ENV{PERL_LWP_SSL_CA_PATH}; delete $ENV{PERL_LWP_ENV_PROXY}; -# we can only use HTTP::Request >= 6.07 -my $ver = $HTTP::Request::VERSION || '6.00'; -my $ver_ok = eval { HTTP::Request->VERSION("6.07"); }; -my $patch_ver_ok = eval { HTTP::Request->VERSION("6.12"); }; -diag "Some tests for the PUT/PATCH methods can only be run on "; -diag "HTTP::Request version 6.07/6.12 or higher."; -diag "If your version isn't good enough, we'll skip those."; -diag "Your version is $ver and that's " - . ($ver_ok ? '' : 'not ') - . 'good enough'; - # default_header 'Content-Type' should be honored in POST/PUT # if the "Content => 'string'" form is used. Otherwise, x-www-form-urlencoded # will be used @@ -36,8 +25,6 @@ $ua->agent("foo/0.1"); # These forms will all be x-www-form-urlencoded subtest 'PATCH x-www-form-urlencoded' => sub { - plan skip_all => "HTTP::Request version not high enough" - unless $patch_ver_ok; plan tests => 4; for my $arg ( [{cat => 'dog'}], @@ -59,7 +46,6 @@ EOT # These forms will all be x-www-form-urlencoded subtest 'PUT x-www-form-urlencoded' => sub { - plan skip_all => "HTTP::Request version not high enough" unless $ver_ok; plan tests => 4; for my $arg ( [{cat => 'dog'}], diff --git a/t/base/protocols.t b/t/base/protocols.t index 5347b24..2702ea0 100644 --- a/t/base/protocols.t +++ b/t/base/protocols.t @@ -2,7 +2,7 @@ use strict; use warnings; use Test::More; -use LWP::UserAgent; +use LWP::UserAgent (); plan tests => 7; my $ua = LWP::UserAgent->new(); diff --git a/t/base/proxy.t b/t/base/proxy.t index d90f440..4c714ad 100644 --- a/t/base/proxy.t +++ b/t/base/proxy.t @@ -1,9 +1,9 @@ use strict; use warnings; use Test::More; -use Test::Fatal; +use Test::Fatal qw( exception ); -use LWP::UserAgent; +use LWP::UserAgent (); plan tests => 8; # in case already defined in user's environment diff --git a/t/base/proxy_request.t b/t/base/proxy_request.t new file mode 100644 index 0000000..0b104d8 --- /dev/null +++ b/t/base/proxy_request.t @@ -0,0 +1,44 @@ +use strict; +use warnings; +use Test::More; + +use LWP::UserAgent (); + +# Prevent environment from interfering with test: +delete $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME}; +delete $ENV{HTTPS_CA_FILE}; +delete $ENV{HTTPS_CA_DIR}; +delete $ENV{PERL_LWP_SSL_CA_FILE}; +delete $ENV{PERL_LWP_SSL_CA_PATH}; +delete $ENV{PERL_LWP_ENV_PROXY}; + +my $ua = LWP::UserAgent->new; +$ua->default_header( 'Content-Type' => 'application/json' ); +$ua->proxy( http => "loopback:" ); +$ua->agent("foo/0.1"); + +is( + $ua->get("http://www.example.org")->content, + <no_proxy('ample.org'); +is_deeply( + $ua->{no_proxy}, ['ample.org'], + "no_proxy with partial domain got set" +); + +is( + $ua->get("http://www.example.org")->content, + < 1; diff --git a/t/leak/no_leak.t b/t/leak/no_leak.t index f2b1ce6..a6ce7fa 100644 --- a/t/leak/no_leak.t +++ b/t/leak/no_leak.t @@ -9,7 +9,7 @@ use Test::More; use Test::Needs 'Test::LeakTrace'; use File::Temp (); -use LWP::UserAgent; +use LWP::UserAgent (); plan skip_all => 'skip leak test in COVERAGE' if $ENV{COVERAGE}; diff --git a/t/local/autoload-get.t b/t/local/autoload-get.t index ad2bab3..3013f15 100644 --- a/t/local/autoload-get.t +++ b/t/local/autoload-get.t @@ -2,8 +2,8 @@ use strict; use warnings; use Test::More; -use LWP::UserAgent; -use URI; +use LWP::UserAgent (); +use URI (); plan tests => 4; diff --git a/t/local/autoload.t b/t/local/autoload.t index 6ed4645..5336445 100644 --- a/t/local/autoload.t +++ b/t/local/autoload.t @@ -2,9 +2,9 @@ use strict; use warnings; use Test::More; -use HTTP::Request; -use LWP::UserAgent; -use URI; +use HTTP::Request (); +use LWP::UserAgent (); +use URI (); plan tests => 4; diff --git a/t/local/cookie_jar.t b/t/local/cookie_jar.t new file mode 100644 index 0000000..b4ef789 --- /dev/null +++ b/t/local/cookie_jar.t @@ -0,0 +1,42 @@ +#!perl + +use strict; +use warnings; + +use Test::More; +use Test::Fatal qw( exception ); + +use_ok 'LWP::UserAgent'; + +my $ua = LWP::UserAgent->new( cookie_jar => {} ); +isa_ok $ua->cookie_jar, 'HTTP::Cookies'; + +$ua = LWP::UserAgent->new; +is $ua->cookie_jar, undef, 'no cookie_jar by default'; +$ua->cookie_jar( {} ); +note '... but setting one from hash uses default cookie_jar_class'; +isa_ok $ua->cookie_jar, 'HTTP::Cookies'; + +$ua = LWP::UserAgent->new( cookie_jar_class => 'HTTP::CookieJar::LWP' ); +$ua->cookie_jar( {} ); +isa_ok $ua->cookie_jar, 'HTTP::CookieJar::LWP'; + +$ua = LWP::UserAgent->new( cookie_jar_class => 'HTTP::CookieJar::LWP' ); +is $ua->cookie_jar, undef, + 'no cookie jar by default despite cookie_jar_class being set'; + +$ua = LWP::UserAgent->new( + cookie_jar_class => 'HTTP::CookieJar::LWP', + cookie_jar => {} +); +note 'cookie_jar and cookie_jar_class can be ued together'; +isa_ok $ua->cookie_jar, 'HTTP::CookieJar::LWP'; + +ok exception { + LWP::UserAgent->new( + cookie_jar_class => 'HTTP::CookieMonster::WasHere', + cookie_jar => {}, + ) +}, 'dies when the cookie_jar_class cannot be loaded'; + +done_testing(); diff --git a/t/local/download_to_fh.t b/t/local/download_to_fh.t index d5961bb..777907a 100644 --- a/t/local/download_to_fh.t +++ b/t/local/download_to_fh.t @@ -2,10 +2,9 @@ use strict; use warnings; use Test::More; -use File::Temp; -use LWP::UserAgent; -use LWP::Simple; -require LWP::Protocol::file; +use File::Temp (); +use LWP::UserAgent (); +use LWP::Simple qw( $ua ); my $src = File::Temp->new("src-XXXXXXXXX"); my $dst = File::Temp->new("dst-XXXXXXXXX"); diff --git a/t/local/get.t b/t/local/get.t index f3e7ef0..bc3ef20 100644 --- a/t/local/get.t +++ b/t/local/get.t @@ -2,9 +2,8 @@ use strict; use warnings; use Test::More; -use File::Temp 'tempdir'; -use LWP::Simple; -require LWP::Protocol::file; +use File::Temp qw( tempdir ); +use LWP::Simple qw( get getprint getstore head ); my $TMPDIR = undef; diff --git a/t/local/http.t b/t/local/http.t index e40f67a..dfa332a 100644 --- a/t/local/http.t +++ b/t/local/http.t @@ -1,16 +1,15 @@ use strict; use warnings; use Test::More; -use Test::Fatal; +use Test::Fatal qw( exception ); -use Config; -use FindBin qw($Bin); +use Config qw( %Config ); +use FindBin qw( $Bin ); use HTTP::Cookies (); -use HTTP::Daemon; -use HTTP::Request; -use IO::Socket; -use LWP::UserAgent; -use URI; +use HTTP::Daemon (); +use HTTP::Request (); +use LWP::UserAgent (); +use URI (); use utf8; delete $ENV{PERL_LWP_ENV_PROXY}; @@ -64,7 +63,7 @@ sub _test { return plan skip_all => 'We could not talk to our daemon' unless $DAEMON; return plan skip_all => 'No base URI' unless $base; - plan tests => 130; + plan tests => 136; my $ua = LWP::UserAgent->new; $ua->agent("Mozilla/0.01 " . $ua->agent); @@ -429,6 +428,48 @@ sub _test { # Must have only one cookie is( scalar( () = $res->decoded_content =~ /who\s*=\s*cookie_man/g ), 1, "request had only one cookie header" ) } + { # timeouts for cached connections + $ua->conn_cache({}); + my $conn_cache = $ua->conn_cache; + isa_ok($conn_cache, 'LWP::ConnCache', 'connection cache was created'); + + my $timeout = $ua->timeout; + $ua->timeout(30); + $ua->get( url( "/echo", $base ) ); + + # one connection is now cached, the cached connection has a timeout of 30 + is( + ( $conn_cache->get_connections )[0]->timeout, 30, + 'first connection has the right timeout' + ); + + $ua->timeout(40); + is( + ( $conn_cache->get_connections )[0]->timeout, 40, + '... and its timeout gets updated' + ); + + # setting the connection cache to an existing cache object should + # update that cache's connections' timeouts + $ua->conn_cache(undef); + is($ua->conn_cache, undef, 'connection cache can be set back to default value of undef'); + + $ua->timeout(50); + is( + ( $conn_cache->get_connections )[0]->timeout, 40, + '... and changing the UA timeout does not affect the removed connection cache' + ); + + $ua->conn_cache($conn_cache); + is( + ( $conn_cache->get_connections )[0]->timeout, 50, + 'assigning existing connection cache updates its timeout to our timeout' + ); + + # restore defaults + $ua->timeout($timeout); + $ua->conn_cache(undef); + } { # terminate server my $req = HTTP::Request->new(GET => url("/quit", $base)); my $res = $ua->request($req); diff --git a/t/local/httpsub.t b/t/local/httpsub.t index 19eb245..599cc6c 100644 --- a/t/local/httpsub.t +++ b/t/local/httpsub.t @@ -2,10 +2,9 @@ use strict; use warnings; use Test::More; -use HTTP::Request; -use LWP::UserAgent; -use LWP::Protocol; -use URI; +use HTTP::Request (); +use LWP::UserAgent (); +use LWP::Protocol (); plan tests => 2; diff --git a/t/local/protosub.t b/t/local/protosub.t index c022049..ed9c69a 100644 --- a/t/local/protosub.t +++ b/t/local/protosub.t @@ -2,10 +2,9 @@ use strict; use warnings; use Test::More; -use HTTP::Request; -use LWP::UserAgent; -use LWP::Protocol; -use URI; +use HTTP::Request (); +use LWP::UserAgent (); +use LWP::Protocol (); LWP::Protocol::implementor(http => 'myhttp'); diff --git a/t/robot/ua-get.t b/t/robot/ua-get.t index 50cd9f6..9e02380 100644 --- a/t/robot/ua-get.t +++ b/t/robot/ua-get.t @@ -2,13 +2,11 @@ use strict; use warnings; use Test::More; -use Config; -use FindBin qw($Bin); -use HTTP::Daemon; -use HTTP::Request; -use IO::Socket; -use LWP::RobotUA; -use URI; +use Config qw( %Config ); +use FindBin qw( $Bin ); +use HTTP::Daemon (); +use LWP::RobotUA (); +use URI (); use utf8; delete $ENV{PERL_LWP_ENV_PROXY}; diff --git a/t/robot/ua.t b/t/robot/ua.t index b22f930..a1a6478 100644 --- a/t/robot/ua.t +++ b/t/robot/ua.t @@ -2,13 +2,12 @@ use strict; use warnings; use Test::More; -use Config; -use FindBin qw($Bin); -use HTTP::Daemon; -use HTTP::Request; -use IO::Socket; -use LWP::RobotUA; -use URI; +use Config qw( %Config ); +use FindBin qw( $Bin ); +use HTTP::Daemon (); +use HTTP::Request (); +use LWP::RobotUA (); +use URI (); use utf8; delete $ENV{PERL_LWP_ENV_PROXY}; diff --git a/xt/author/eol.t b/xt/author/eol.t index 7b9607d..133a73b 100644 --- a/xt/author/eol.t +++ b/xt/author/eol.t @@ -41,12 +41,14 @@ my @files = ( 't/base/protocols.t', 't/base/protocols/nntp.t', 't/base/proxy.t', + 't/base/proxy_request.t', 't/base/simple.t', 't/base/ua.t', 't/base/ua_handlers.t', 't/leak/no_leak.t', 't/local/autoload-get.t', 't/local/autoload.t', + 't/local/cookie_jar.t', 't/local/download_to_fh.t', 't/local/get.t', 't/local/http.t', diff --git a/xt/author/live/apache-http10.t b/xt/author/live/apache-http10.t index 86694f8..dbdbcbc 100644 --- a/xt/author/live/apache-http10.t +++ b/xt/author/live/apache-http10.t @@ -3,8 +3,8 @@ use warnings; use Test::More; use Test::RequiresInternet ('www.google.com' => 80); -use HTTP::Request; -use LWP::UserAgent; +use HTTP::Request (); +use LWP::UserAgent (); plan tests => 2; diff --git a/xt/author/live/jigsaw/auth-b.t b/xt/author/live/jigsaw/auth-b.t index 4448db3..729066a 100644 --- a/xt/author/live/jigsaw/auth-b.t +++ b/xt/author/live/jigsaw/auth-b.t @@ -3,8 +3,8 @@ use warnings; use Test::More; use Test::RequiresInternet ('jigsaw.w3.org' => 443); -use HTTP::Request; -use LWP::UserAgent; +use HTTP::Request (); +use LWP::UserAgent (); plan tests => 9; diff --git a/xt/author/live/jigsaw/auth-d.t b/xt/author/live/jigsaw/auth-d.t index b1ea7a3..210c26b 100644 --- a/xt/author/live/jigsaw/auth-d.t +++ b/xt/author/live/jigsaw/auth-d.t @@ -3,8 +3,7 @@ use warnings; use Test::More; use Test::RequiresInternet ('jigsaw.w3.org' => 443); -use HTTP::Request; -use LWP::UserAgent; +use HTTP::Request (); { diff --git a/xt/author/live/jigsaw/chunk.t b/xt/author/live/jigsaw/chunk.t index 21d339f..f32a9ab 100644 --- a/xt/author/live/jigsaw/chunk.t +++ b/xt/author/live/jigsaw/chunk.t @@ -3,8 +3,8 @@ use warnings; use Test::More; use Test::RequiresInternet ('jigsaw.w3.org' => 443); -use HTTP::Request; -use LWP::UserAgent; +use HTTP::Request (); +use LWP::UserAgent (); plan tests => 8; diff --git a/xt/author/live/jigsaw/md5-get.t b/xt/author/live/jigsaw/md5-get.t index dfc0004..193d910 100644 --- a/xt/author/live/jigsaw/md5-get.t +++ b/xt/author/live/jigsaw/md5-get.t @@ -3,9 +3,8 @@ use warnings; use Test::More; use Test::RequiresInternet ('jigsaw.w3.org' => 443); -use Digest::MD5 qw(md5_base64); -use HTTP::Request; -use LWP::UserAgent; +use Digest::MD5 qw( md5_base64 ); +use LWP::UserAgent (); my $tests = 5; plan tests => $tests; diff --git a/xt/author/live/jigsaw/md5.t b/xt/author/live/jigsaw/md5.t index 1665a68..af2adcc 100644 --- a/xt/author/live/jigsaw/md5.t +++ b/xt/author/live/jigsaw/md5.t @@ -3,9 +3,9 @@ use warnings; use Test::More; use Test::RequiresInternet ('jigsaw.w3.org' => 443); -use Digest::MD5 qw(md5_base64); -use HTTP::Request; -use LWP::UserAgent; +use Digest::MD5 qw( md5_base64 ); +use HTTP::Request (); +use LWP::UserAgent (); my $tests = 5; diff --git a/xt/author/live/jigsaw/neg-get.t b/xt/author/live/jigsaw/neg-get.t index 5d03d7c..e587db6 100644 --- a/xt/author/live/jigsaw/neg-get.t +++ b/xt/author/live/jigsaw/neg-get.t @@ -3,7 +3,7 @@ use warnings; use Test::More; use Test::RequiresInternet ('jigsaw.w3.org' => 443); -use LWP::UserAgent; +use LWP::UserAgent (); plan tests => 2; diff --git a/xt/author/live/jigsaw/neg.t b/xt/author/live/jigsaw/neg.t index f9ec7de..be1b5a8 100644 --- a/xt/author/live/jigsaw/neg.t +++ b/xt/author/live/jigsaw/neg.t @@ -3,8 +3,8 @@ use warnings; use Test::More; use Test::RequiresInternet ('jigsaw.w3.org' => 443); -use HTTP::Request; -use LWP::UserAgent; +use HTTP::Request (); +use LWP::UserAgent (); plan tests => 2; diff --git a/xt/author/live/jigsaw/redirect-post.t b/xt/author/live/jigsaw/redirect-post.t index 2dbed9a..13db724 100644 --- a/xt/author/live/jigsaw/redirect-post.t +++ b/xt/author/live/jigsaw/redirect-post.t @@ -3,10 +3,10 @@ use warnings; use Test::More; use Test::RequiresInternet ('jigsaw.w3.org' => 443); -use HTTP::Request; -use LWP::UserAgent; -use JSON::PP qw(encode_json); -use Encode qw(encode_utf8); +use HTTP::Request (); +use LWP::UserAgent (); +use JSON::PP qw( encode_json ); +use Encode qw( encode_utf8 ); plan tests => 10; diff --git a/xt/author/live/jigsaw/te.t b/xt/author/live/jigsaw/te.t index c2ae5e4..d81077a 100644 --- a/xt/author/live/jigsaw/te.t +++ b/xt/author/live/jigsaw/te.t @@ -3,8 +3,8 @@ use warnings; use Test::More; use Test::RequiresInternet ('jigsaw.w3.org' => 443); -use HTTP::Request; -use LWP::UserAgent; +use HTTP::Request (); +use LWP::UserAgent (); SKIP: { skip 'LIVE_JIGSAW_TESTS not enabled', 3 if $ENV{NO_JIGSAW}; diff --git a/xt/author/live/online.t b/xt/author/live/online.t index cc71391..a636038 100644 --- a/xt/author/live/online.t +++ b/xt/author/live/online.t @@ -2,7 +2,7 @@ use strict; use warnings; use Test::More; -use LWP::UserAgent; +use LWP::UserAgent (); plan tests => 4; diff --git a/xt/author/misc/dbmrobot b/xt/author/misc/dbmrobot index 770edc2..b73473c 100644 --- a/xt/author/misc/dbmrobot +++ b/xt/author/misc/dbmrobot @@ -2,9 +2,9 @@ use strict; use warnings; -use LWP::RobotUA; -use URI::URL; -use WWW::RobotRules::AnyDBM_File; +use LWP::RobotUA (); +use URI::URL qw( url ); +use WWW::RobotRules::AnyDBM_File (); my $url = url(shift) || die "Usage: $0 \n"; my $botname = "Spider/0.1"; diff --git a/xt/author/misc/get-callback b/xt/author/misc/get-callback index 0447dee..e529e4e 100644 --- a/xt/author/misc/get-callback +++ b/xt/author/misc/get-callback @@ -2,7 +2,7 @@ use strict; use warnings; -use LWP::UserAgent; +use LWP::UserAgent (); my $url = shift || ""; $url = "http://localhost:8080/$url" unless $url =~ /:/; diff --git a/xt/author/misc/get-file b/xt/author/misc/get-file index 9218351..8a68e17 100644 --- a/xt/author/misc/get-file +++ b/xt/author/misc/get-file @@ -3,7 +3,7 @@ use strict; use warnings; -use LWP::UserAgent; +use LWP::UserAgent (); my $file = shift || ""; my $to = $file; diff --git a/xt/author/net/cache-timeouts.t b/xt/author/net/cache-timeouts.t index 20fe2be..53d9855 100644 --- a/xt/author/net/cache-timeouts.t +++ b/xt/author/net/cache-timeouts.t @@ -2,10 +2,10 @@ use strict; use warnings; use Test::More; -use FindBin qw($Bin); -use HTTP::Request; -use LWP::UserAgent; -use LWP::ConnCache; +use FindBin qw( $Bin ); +use HTTP::Request (); +use LWP::UserAgent (); +use LWP::ConnCache (); if (!-e "$Bin/config.pl") { plan skip_all => 'no net config file'; diff --git a/xt/author/net/http-get.t b/xt/author/net/http-get.t index f0c9df9..1c86c70 100644 --- a/xt/author/net/http-get.t +++ b/xt/author/net/http-get.t @@ -2,9 +2,9 @@ use strict; use warnings; use Test::More; -use FindBin qw($Bin); -use HTTP::Request; -use LWP::UserAgent; +use FindBin qw( $Bin ); +use HTTP::Request (); +use LWP::UserAgent (); if (!-e "$Bin/config.pl") { plan skip_all => 'no net config file'; diff --git a/xt/author/net/http-post.t b/xt/author/net/http-post.t index dcc74b1..5068dea 100644 --- a/xt/author/net/http-post.t +++ b/xt/author/net/http-post.t @@ -2,9 +2,9 @@ use strict; use warnings; use Test::More; -use FindBin qw($Bin); -use HTTP::Request; -use LWP::UserAgent; +use FindBin qw( $Bin ); +use HTTP::Request (); +use LWP::UserAgent (); if (!-e "$Bin/config.pl") { plan skip_all => 'no net config file'; diff --git a/xt/author/net/http-timeout.t b/xt/author/net/http-timeout.t index 205742e..9748ac0 100644 --- a/xt/author/net/http-timeout.t +++ b/xt/author/net/http-timeout.t @@ -2,9 +2,9 @@ use strict; use warnings; use Test::More; -use FindBin qw($Bin); -use HTTP::Request; -use LWP::UserAgent; +use FindBin qw( $Bin ); +use HTTP::Request (); +use LWP::UserAgent (); if (!-e "$Bin/config.pl") { plan skip_all => 'no net config file'; diff --git a/xt/author/net/mirror.t b/xt/author/net/mirror.t index 3d98181..8485eb6 100644 --- a/xt/author/net/mirror.t +++ b/xt/author/net/mirror.t @@ -2,8 +2,8 @@ use strict; use warnings; use Test::More; -use FindBin qw($Bin); -use LWP::UserAgent; +use FindBin qw( $Bin ); +use LWP::UserAgent (); if (!-e "$Bin/config.pl") { plan skip_all => 'no net config file'; diff --git a/xt/author/net/moved.t b/xt/author/net/moved.t index 4ba6f2e..947dc0b 100644 --- a/xt/author/net/moved.t +++ b/xt/author/net/moved.t @@ -2,9 +2,9 @@ use strict; use warnings; use Test::More; -use FindBin qw($Bin); -use HTTP::Request; -use LWP::UserAgent; +use FindBin qw( $Bin ); +use HTTP::Request (); +use LWP::UserAgent (); if (!-e "$Bin/config.pl") { plan skip_all => 'no net config file'; diff --git a/xt/author/net/proxy.t b/xt/author/net/proxy.t index 11e2330..e4cb8ce 100644 --- a/xt/author/net/proxy.t +++ b/xt/author/net/proxy.t @@ -2,9 +2,9 @@ use strict; use warnings; use Test::More; -use FindBin qw($Bin); -use HTTP::Request; -use LWP::UserAgent; +use FindBin qw( $Bin ); +use HTTP::Request (); +use LWP::UserAgent (); if (!-e "$Bin/config.pl") { plan skip_all => 'no net config file'; diff --git a/xt/author/pod-spell.t b/xt/author/pod-spell.t index 67282bb..5656c8d 100644 --- a/xt/author/pod-spell.t +++ b/xt/author/pod-spell.t @@ -36,6 +36,7 @@ BooK Bron Bryan Buenzli +Burak Burke CGI CPAN @@ -71,11 +72,13 @@ Duret Dvornik Eckankar Eldridge +Eric Etheridge FWILES Fabian Father Fesler +Fiegehenn Finch Fowler Frank @@ -98,8 +101,10 @@ Gregoire Gregory Grossmann Guenther +Gursoy Gurusamy Gustafsson +Gutowski Hakanson Hanak Hans @@ -125,9 +130,12 @@ Joe Joerg Johannessen John +Johnson Jonathan Jr +Julien KONISHI +Kacper Kaji Kaminsky Kapranoff @@ -316,6 +324,7 @@ at bin brong bryan +burak capoeirab cjm colin @@ -331,6 +340,7 @@ dot doug dpettit dsteinbrunner +eric erik ether faz @@ -354,6 +364,7 @@ haarg hfroehlich http iank +instantiation jefflee jfesler jmates @@ -378,6 +389,7 @@ michealgong michiel mmcleric murphy +mwgamera nalabelle naveedm9 nawglan diff --git a/xt/author/portability.t b/xt/author/portability.t index c531252..6d1d92d 100644 --- a/xt/author/portability.t +++ b/xt/author/portability.t @@ -3,8 +3,6 @@ use warnings; use Test::More; -eval 'use Test::Portability::Files'; -plan skip_all => 'Test::Portability::Files required for testing portability' - if $@; +use Test::Portability::Files; run_tests(); diff --git a/xt/release/changes_has_content.t b/xt/release/changes_has_content.t index fe96d63..5b91ef6 100644 --- a/xt/release/changes_has_content.t +++ b/xt/release/changes_has_content.t @@ -8,7 +8,7 @@ if (($ENV{TRAVIS_PULL_REQUEST} || '') eq 'false') { note 'Checking Changes'; my $changes_file = 'Changes'; -my $newver = '6.67'; +my $newver = '6.72'; my $trial_token = '-TRIAL'; my $encoding = 'UTF-8'; -- 2.7.4