Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Item13897: Fixed a bug in Foswiki::Net.
- Added Plack::Test to DEPENDENCIES
  • Loading branch information
vrurg committed Nov 1, 2016
1 parent a1d2d13 commit 7851f88
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 15 deletions.
2 changes: 1 addition & 1 deletion UnitTestContrib/test/unit/NetTests.pm
Expand Up @@ -4,7 +4,7 @@ use v5.14;

use Foswiki::Net;

use Moo;
use Foswiki::Class;
extends qw( FoswikiTestCase );

our $expectedHeader;
Expand Down
10 changes: 5 additions & 5 deletions core/lib/Foswiki/Config.pm
Expand Up @@ -117,7 +117,7 @@ Keeps the name of the failed config or spec file.
=cut

has failedConfig => ( is => 'rw', );
has failedConfig => ( is => 'rw', );

=begin TML
Expand All @@ -141,7 +141,7 @@ See [[#ObjectMethodNew][constructor new()]].
=cut

has noExpand => ( is => 'rw', default => 0, );
has noExpand => ( is => 'rw', default => 0, );

=begin TML
Expand All @@ -154,7 +154,7 @@ See [[#ObjectMethodNew][constructor new()]].
=cut

has noSpec => ( is => 'rw', default => 0, );
has noSpec => ( is => 'rw', default => 0, );

=begin TML
Expand All @@ -167,7 +167,7 @@ See [[#ObjectMethodNew][constructor new()]].
=cut

has configSpec => ( is => 'rw', default => 0, );
has configSpec => ( is => 'rw', default => 0, );

=begin TML
Expand All @@ -180,7 +180,7 @@ See [[#ObjectMethodNew][constructor new()]].
=cut

has noLocal => ( is => 'rw', default => 0, );
has noLocal => ( is => 'rw', default => 0, );

# Configuration shortcut attributes.

Expand Down
19 changes: 10 additions & 9 deletions core/lib/Foswiki/Contrib/core/DEPENDENCIES
Expand Up @@ -6,16 +6,16 @@ CGI,>=3.15,cpan,Required, for base Foswiki (Versions 2.89, 3.37, 3.43, 3.47 and
CGI::Cookie,>=1.24,cpan,Required, Installs as part of CGI.
CGI::Session,>=4.30,cpan,Required, for configure and Sessions support, available from the CPAN archive.
Compress::Zlib,>0, cpan, Optional, used if Cache compression is enabled.
DBI,>=0,cpan,Optional Foswiki Page Cache. Also install one DBD:: module
DBD::mysql,>=0,cpan,Optional Foswiki Page Cache using MySQL
DBD::Pg,>=0,cpan,Optional Foswiki Page Cache using PostgreSQL
DBD::SQLite,>=0,cpan,Optional Foswiki Page Cache using SQLite
Digest::SHA,>=0,cpan,Optional, may be required for password encryption.
Convert::PEM,>=0,cpan,Optional S/MIME email signing feature.
Crypt::Eksblowfish::Bcrypt,>0,cpan,Optional, only needed if Foswiki passwords should be encoded using bcrypt.
Crypt::PasswdMD5,>=0,cpan,Required, for admin password hash and .htpasswd encoding.
Crypt::SMIME,>=0,cpan,Optional S/MIME email signing feature.
Crypt::X509,>=0,cpan,Optional S/MIME email signing feature.
Convert::PEM,>=0,cpan,Optional S/MIME email signing feature.
DBD::Pg,>=0,cpan,Optional Foswiki Page Cache using PostgreSQL
DBD::SQLite,>=0,cpan,Optional Foswiki Page Cache using SQLite
DBD::mysql,>=0,cpan,Optional Foswiki Page Cache using MySQL
DBI,>=0,cpan,Optional Foswiki Page Cache
Digest::SHA,>=0,cpan,Optional, may be required for password encryption.
Email::MIME,>=1.903,cpan,Required for correct handling of email MIME structure.
Email::Simple,>=2.206,cpan,Required for compatibility with Email::MIME.
Encode,>=2.01,cpan,Required for international characters.
Expand All @@ -25,13 +25,14 @@ HTML::Parser,>=3.28,cpan,Required, for WysiwygPlugin.
HTML::Tree,>=3.23,cpan,Required. for CompareRevisionsAddOn.
IO::Socket::IP,>=0.14,cpan,Optional, for IPv6.
IO::Socket::SSL,>=1.80,cpan,Optional, for outbound SSL/TLS connections, eg. e-mail.
LWP,>=0,cpan,Optional, needed by the Configure Extensions installer,for external URL based INCLUDEs and URL item verification.
LWP::Protocol::https,>=0,cpan,Optional, needed by the Configure Extensions installer,for external URL based INCLUDEs and URL item verification.
Locale::Language,>=0,cpan,Optional, required if {UserInterfaceInternationalisation} is enabled in configuration.
Locale::Maketext::Lexicon,>=0,cpan,Optional, required if {UserInterfaceInternationalisation} is enabled in configuration.
Locale::Msgfmt,>=0,cpan,Optional, used to compress the language files in locale directory if enabled.
LWP,>=0,cpan,Optional, needed by the Configure Extensions installer,for external URL based INCLUDEs and URL item verification.
LWP::Protocol::https,>=0,cpan,Optional, needed by the Configure Extensions installer,for external URL based INCLUDEs and URL item verification.
Mozilla::CA,>=20110904,cpan,Optional, SSL host verification for e-mail and other SSL/TLS connections.
Plack::Test,>=0,cpan,Optional, but needed by tests.
Socket,>=2.001,cpan,Required, for base Foswiki.
URI,>=0,cpan,Required, used for Foswiki::Net URL parsing
version,>=0.77,cpan,Required, Used for standard perl version strings.
Win32::Console,>=0,cpan,Optional, required on Windows platforms if {UserInterfaceInternationalisation} is enabled in configuration.
version,>=0.77,cpan,Required, Used for standard perl version strings.
2 changes: 2 additions & 0 deletions core/lib/Foswiki/Net.pm
Expand Up @@ -286,6 +286,8 @@ sub getExternalResource {
eval 'require HTTP::Response' unless ($noHTTPResponse);
if ( $@ || $noHTTPResponse ) {

Foswiki::load_class('Foswiki::Net::HTTPResponse');

# Nope, no HTTP::Response, have to do things the hard way :-(
$response = Foswiki::Net::HTTPResponse->parse($result);
}
Expand Down

0 comments on commit 7851f88

Please sign in to comment.