r24956 - in /branches/upstream/libpoe-component-server-simplehttp-perl/current: ./ inc/Module/ inc/Module/Install/ lib/POE/Component/Server/ lib/POE/Component/Server/SimpleHTTP/
dmn at users.alioth.debian.org
dmn at users.alioth.debian.org
Tue Sep 9 20:35:31 UTC 2008
Author: dmn
Date: Tue Sep 9 20:35:26 2008
New Revision: 24956
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=24956
Log:
[svn-upgrade] Integrating new upstream version, libpoe-component-server-simplehttp-perl (1.48)
Modified:
branches/upstream/libpoe-component-server-simplehttp-perl/current/Changes
branches/upstream/libpoe-component-server-simplehttp-perl/current/META.yml
branches/upstream/libpoe-component-server-simplehttp-perl/current/Makefile.PL
branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install.pm
branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Base.pm
branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Can.pm
branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Fetch.pm
branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Makefile.pm
branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Metadata.pm
branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Win32.pm
branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/WriteAll.pm
branches/upstream/libpoe-component-server-simplehttp-perl/current/lib/POE/Component/Server/SimpleHTTP.pm
branches/upstream/libpoe-component-server-simplehttp-perl/current/lib/POE/Component/Server/SimpleHTTP/Connection.pm
branches/upstream/libpoe-component-server-simplehttp-perl/current/lib/POE/Component/Server/SimpleHTTP/PreFork.pm
branches/upstream/libpoe-component-server-simplehttp-perl/current/lib/POE/Component/Server/SimpleHTTP/Response.pm
Modified: branches/upstream/libpoe-component-server-simplehttp-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-server-simplehttp-perl/current/Changes?rev=24956&op=diff
==============================================================================
--- branches/upstream/libpoe-component-server-simplehttp-perl/current/Changes (original)
+++ branches/upstream/libpoe-component-server-simplehttp-perl/current/Changes Tue Sep 9 20:35:26 2008
@@ -1,3 +1,26 @@
+========================
+2008-09-05 15:39:31 1.48
+========================
+
+ 2008-09-05 15:36:56 (r121) by bingos; Makefile.PL M
+
+ Added makemaker_args() directive to Makefile.PL, thanks to Matt Trout
+ for that tip
+
+ 2008-09-05 15:34:46 (r120) by bingos
+ lib/POE/Component/Server/SimpleHTTP/PreFork.pm M;
+ lib/POE/Component/Server/SimpleHTTP/Response.pm M;
+ lib/POE/Component/Server/SimpleHTTP/Connection.pm M;
+ lib/POE/Component/Server/SimpleHTTP.pm M
+
+ Removed the FATAL => 'all' from use warnings. suggested by Andreas
+ Gudmundsson
+
+ 2008-09-05 15:24:08 (r119) by bingos
+ lib/POE/Component/Server/SimpleHTTP.pm M; Changes M
+
+ Downstream Debian patch applied RT #38743 by Martin Ferrari
+
========================
2008-04-14 12:09:28 1.46
========================
Modified: branches/upstream/libpoe-component-server-simplehttp-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-server-simplehttp-perl/current/META.yml?rev=24956&op=diff
==============================================================================
--- branches/upstream/libpoe-component-server-simplehttp-perl/current/META.yml (original)
+++ branches/upstream/libpoe-component-server-simplehttp-perl/current/META.yml Tue Sep 9 20:35:26 2008
@@ -7,16 +7,17 @@
LWP::UserAgent: 0
Test::More: 0.47
distribution_type: module
-generated_by: 'Module::Install version 0.71'
+generated_by: 'Module::Install version 0.77'
license: perl
meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.3.html
- version: 1.3
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
name: POE-Component-Server-SimpleHTTP
no_index:
directory:
- inc
- t
+ - examples
requires:
Carp: 0
HTTP::Date: 0
@@ -26,4 +27,6 @@
Socket: 0
Storable: 0
Sys::Hostname: 0
-version: 1.46
+resources:
+ license: http://dev.perl.org/licenses/
+version: 1.48
Modified: branches/upstream/libpoe-component-server-simplehttp-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-server-simplehttp-perl/current/Makefile.PL?rev=24956&op=diff
==============================================================================
--- branches/upstream/libpoe-component-server-simplehttp-perl/current/Makefile.PL (original)
+++ branches/upstream/libpoe-component-server-simplehttp-perl/current/Makefile.PL Tue Sep 9 20:35:26 2008
@@ -43,4 +43,7 @@
eval { require IPC::Shareable; };
build_requires 'POE::Component::Client::HTTP' => 0.82 unless $@;
+# Thanks to Matt Trout for this tip
+makemaker_args(dist => { PREOP => "$^X ./tools/svn-log.perl > ./Changes" });
+
WriteAll();
Modified: branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install.pm?rev=24956&op=diff
==============================================================================
--- branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install.pm (original)
+++ branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install.pm Tue Sep 9 20:35:26 2008
@@ -30,7 +30,11 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '0.71';
+ $VERSION = '0.77';
+
+ *inc::Module::Install::VERSION = *VERSION;
+ @inc::Module::Install::ISA = __PACKAGE__;
+
}
@@ -81,7 +85,7 @@
# Build.PL was formerly supported, but no longer is due to excessive
# difficulty in implementing every single feature twice.
-if ( $0 =~ /Build.PL$/i or -f 'Build.PL' ) { die <<"END_DIE" }
+if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" }
Module::Install no longer supports Build.PL.
@@ -90,6 +94,15 @@
Please remove all Build.PL files and only use the Makefile.PL installer.
END_DIE
+
+
+
+
+
+# To save some more typing in Module::Install installers, every...
+# use inc::Module::Install
+# ...also acts as an implicit use strict.
+$^H |= strict::bits(qw(refs subs vars));
@@ -99,9 +112,6 @@
use File::Find ();
use File::Path ();
use FindBin;
-
-*inc::Module::Install::VERSION = *VERSION;
- at inc::Module::Install::ISA = __PACKAGE__;
sub autoload {
my $self = shift;
@@ -115,8 +125,10 @@
goto &$code unless $cwd eq $pwd;
}
$$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym";
- unshift @_, ( $self, $1 );
- goto &{$self->can('call')} unless uc($1) eq $1;
+ unless ( uc($1) eq $1 ) {
+ unshift @_, ( $self, $1 );
+ goto &{$self->can('call')};
+ }
};
}
@@ -329,7 +341,10 @@
close FH or die "close($_[0]): $!";
}
-sub _version {
+# _version is for processing module versions (eg, 1.03_05) not
+# Perl versions (eg, 5.8.1).
+
+sub _version ($) {
my $s = shift || 0;
$s =~ s/^(\d+)\.?//;
my $l = $1 || 0;
@@ -338,6 +353,17 @@
return $l + 0;
}
+# Cloned from Params::Util::_CLASS
+sub _CLASS ($) {
+ (
+ defined $_[0]
+ and
+ ! ref $_[0]
+ and
+ $_[0] =~ m/^[^\W\d]\w*(?:::\w+)*$/s
+ ) ? $_[0] : undef;
+}
+
1;
# Copyright 2008 Adam Kennedy.
Modified: branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Base.pm?rev=24956&op=diff
==============================================================================
--- branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Base.pm (original)
+++ branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Base.pm Tue Sep 9 20:35:26 2008
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.71';
+$VERSION = '0.77';
# Suspend handler for "redefined" warnings
BEGIN {
@@ -45,6 +45,8 @@
$_[0]->_top->{admin} or Module::Install::Base::FakeAdmin->new;
}
+#line 101
+
sub is_admin {
$_[0]->admin->VERSION;
}
@@ -67,4 +69,4 @@
1;
-#line 138
+#line 146
Modified: branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Can.pm?rev=24956&op=diff
==============================================================================
--- branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Can.pm (original)
+++ branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Can.pm Tue Sep 9 20:35:26 2008
@@ -11,7 +11,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.71';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -39,6 +39,7 @@
return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
+ next if $dir eq '';
my $abs = File::Spec->catfile($dir, $_[1]);
return $abs if (-x $abs or $abs = MM->maybe_command($abs));
}
@@ -79,4 +80,4 @@
__END__
-#line 157
+#line 158
Modified: branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Fetch.pm?rev=24956&op=diff
==============================================================================
--- branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Fetch.pm (original)
+++ branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Fetch.pm Tue Sep 9 20:35:26 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.71';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Makefile.pm?rev=24956&op=diff
==============================================================================
--- branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Makefile.pm (original)
+++ branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Makefile.pm Tue Sep 9 20:35:26 2008
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.71';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -36,9 +36,9 @@
sub makemaker_args {
my $self = shift;
- my $args = ($self->{makemaker_args} ||= {});
- %$args = ( %$args, @_ ) if @_;
- $args;
+ my $args = ( $self->{makemaker_args} ||= {} );
+ %$args = ( %$args, @_ );
+ return $args;
}
# For mm args that take multiple space-seperated args,
@@ -116,7 +116,13 @@
# Make sure we have a new enough
require ExtUtils::MakeMaker;
- $self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION );
+
+ # MakeMaker can complain about module versions that include
+ # an underscore, even though its own version may contain one!
+ # Hence the funny regexp to get rid of it. See RT #35800
+ # for details.
+
+ $self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
# Generate the
my $args = $self->makemaker_args;
@@ -175,7 +181,9 @@
my $user_preop = delete $args{dist}->{PREOP};
if (my $preop = $self->admin->preop($user_preop)) {
- $args{dist} = $preop;
+ foreach my $key ( keys %$preop ) {
+ $args{dist}->{$key} = $preop->{$key};
+ }
}
my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
@@ -242,4 +250,4 @@
__END__
-#line 371
+#line 379
Modified: branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Metadata.pm?rev=24956&op=diff
==============================================================================
--- branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Metadata.pm (original)
+++ branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Metadata.pm Tue Sep 9 20:35:26 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.71';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -17,9 +17,7 @@
abstract
author
version
- license
distribution_type
- perl_version
tests
installdirs
};
@@ -30,13 +28,21 @@
requires
recommends
bundles
+ resources
};
-sub Meta { shift }
-sub Meta_ScalarKeys { @scalar_keys }
-sub Meta_TupleKeys { @tuple_keys }
-
-foreach my $key (@scalar_keys) {
+my @resource_keys = qw{
+ homepage
+ bugtracker
+ repository
+};
+
+sub Meta { shift }
+sub Meta_ScalarKeys { @scalar_keys }
+sub Meta_TupleKeys { @tuple_keys }
+sub Meta_ResourceKeys { @resource_keys }
+
+foreach my $key ( @scalar_keys ) {
*$key = sub {
my $self = shift;
return $self->{values}{$key} if defined wantarray and !@_;
@@ -45,12 +51,30 @@
};
}
+foreach my $key ( @resource_keys ) {
+ *$key = sub {
+ my $self = shift;
+ unless ( @_ ) {
+ return () unless $self->{values}{resources};
+ return map { $_->[1] }
+ grep { $_->[0] eq $key }
+ @{ $self->{values}{resources} };
+ }
+ return $self->{values}{resources}{$key} unless @_;
+ my $uri = shift or die(
+ "Did not provide a value to $key()"
+ );
+ $self->resources( $key => $uri );
+ return 1;
+ };
+}
+
sub requires {
my $self = shift;
while ( @_ ) {
my $module = shift or last;
my $version = shift || 0;
- push @{ $self->{values}->{requires} }, [ $module, $version ];
+ push @{ $self->{values}{requires} }, [ $module, $version ];
}
$self->{values}{requires};
}
@@ -60,7 +84,7 @@
while ( @_ ) {
my $module = shift or last;
my $version = shift || 0;
- push @{ $self->{values}->{build_requires} }, [ $module, $version ];
+ push @{ $self->{values}{build_requires} }, [ $module, $version ];
}
$self->{values}{build_requires};
}
@@ -70,7 +94,7 @@
while ( @_ ) {
my $module = shift or last;
my $version = shift || 0;
- push @{ $self->{values}->{configure_requires} }, [ $module, $version ];
+ push @{ $self->{values}{configure_requires} }, [ $module, $version ];
}
$self->{values}{configure_requires};
}
@@ -80,7 +104,7 @@
while ( @_ ) {
my $module = shift or last;
my $version = shift || 0;
- push @{ $self->{values}->{recommends} }, [ $module, $version ];
+ push @{ $self->{values}{recommends} }, [ $module, $version ];
}
$self->{values}{recommends};
}
@@ -90,9 +114,31 @@
while ( @_ ) {
my $module = shift or last;
my $version = shift || 0;
- push @{ $self->{values}->{bundles} }, [ $module, $version ];
+ push @{ $self->{values}{bundles} }, [ $module, $version ];
}
$self->{values}{bundles};
+}
+
+# Resource handling
+my %lc_resource = map { $_ => 1 } qw{
+ homepage
+ license
+ bugtracker
+ repository
+};
+
+sub resources {
+ my $self = shift;
+ while ( @_ ) {
+ my $name = shift or last;
+ my $value = shift or next;
+ if ( $name eq lc $name and ! $lc_resource{$name} ) {
+ die("Unsupported reserved lowercase resource '$name'");
+ }
+ $self->{values}{resources} ||= [];
+ push @{ $self->{values}{resources} }, [ $name, $value ];
+ }
+ $self->{values}{resources};
}
# Aliases for build_requires that will have alternative
@@ -108,30 +154,73 @@
sub sign {
my $self = shift;
- return $self->{'values'}{'sign'} if defined wantarray and ! @_;
- $self->{'values'}{'sign'} = ( @_ ? $_[0] : 1 );
+ return $self->{values}{sign} if defined wantarray and ! @_;
+ $self->{values}{sign} = ( @_ ? $_[0] : 1 );
return $self;
}
sub dynamic_config {
my $self = shift;
unless ( @_ ) {
- warn "You MUST provide an explicit true/false value to dynamic_config, skipping\n";
+ warn "You MUST provide an explicit true/false value to dynamic_config\n";
return $self;
}
$self->{values}{dynamic_config} = $_[0] ? 1 : 0;
- return $self;
+ return 1;
+}
+
+sub perl_version {
+ my $self = shift;
+ return $self->{values}{perl_version} unless @_;
+ my $version = shift or die(
+ "Did not provide a value to perl_version()"
+ );
+
+ # Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
+ # numbers (eg, 5.006001 or 5.008009).
+
+ $version =~ s/^(\d+)\.(\d+)\.(\d+)$/sprintf("%d.%03d%03d",$1,$2,$3)/e;
+
+ $version =~ s/_.+$//;
+ $version = $version + 0; # Numify
+ unless ( $version >= 5.005 ) {
+ die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n";
+ }
+ $self->{values}{perl_version} = $version;
+ return 1;
+}
+
+sub license {
+ my $self = shift;
+ return $self->{values}{license} unless @_;
+ my $license = shift or die(
+ 'Did not provide a value to license()'
+ );
+ $self->{values}{license} = $license;
+
+ # Automatically fill in license URLs
+ if ( $license eq 'perl' ) {
+ $self->resources( license => 'http://dev.perl.org/licenses/' );
+ }
+
+ return 1;
}
sub all_from {
my ( $self, $file ) = @_;
unless ( defined($file) ) {
- my $name = $self->name
- or die "all_from called with no args without setting name() first";
+ my $name = $self->name or die(
+ "all_from called with no args without setting name() first"
+ );
$file = join('/', 'lib', split(/-/, $name)) . '.pm';
$file =~ s{.*/}{} unless -e $file;
- die "all_from: cannot find $file from $name" unless -e $file;
+ unless ( -e $file ) {
+ die("all_from cannot find $file from $name");
+ }
+ }
+ unless ( -f $file ) {
+ die("The path '$file' does not exist, or is not a file");
}
# Some methods pull from POD instead of code.
@@ -210,8 +299,8 @@
while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) {
$self->feature( $name, @$mods );
}
- return $self->{values}->{features}
- ? @{ $self->{values}->{features} }
+ return $self->{values}{features}
+ ? @{ $self->{values}{features} }
: ();
}
@@ -267,22 +356,25 @@
);
}
+# Add both distribution and module name
sub name_from {
- my $self = shift;
+ my ($self, $file) = @_;
if (
- Module::Install::_read($_[0]) =~ m/
- ^ \s
+ Module::Install::_read($file) =~ m/
+ ^ \s*
package \s*
([\w:]+)
\s* ;
/ixms
) {
- my $name = $1;
+ my ($name, $module_name) = ($1, $1);
$name =~ s{::}{-}g;
$self->name($name);
+ unless ( $self->module_name ) {
+ $self->module_name($module_name);
+ }
} else {
- die "Cannot determine name from $_[0]\n";
- return;
+ die("Cannot determine name from $file\n");
}
}
@@ -291,7 +383,7 @@
if (
Module::Install::_read($_[0]) =~ m/
^
- use \s*
+ (?:use|require) \s*
v?
([\d_\.]+)
\s* ;
@@ -341,8 +433,12 @@
my $license_text = $1;
my @phrases = (
'under the same (?:terms|license) as perl itself' => 'perl', 1,
+ 'GNU general public license' => 'gpl', 1,
'GNU public license' => 'gpl', 1,
+ 'GNU lesser general public license' => 'lgpl', 1,
'GNU lesser public license' => 'lgpl', 1,
+ 'GNU library general public license' => 'lgpl', 1,
+ 'GNU library public license' => 'lgpl', 1,
'BSD license' => 'bsd', 1,
'Artistic license' => 'artistic', 1,
'GPL' => 'gpl', 1,
@@ -356,7 +452,7 @@
$pattern =~ s{\s+}{\\s+}g;
if ( $license_text =~ /\b$pattern\b/i ) {
if ( $osi and $license_text =~ /All rights reserved/i ) {
- warn "LEGAL WARNING: 'All rights reserved' may invalidate Open Source licenses. Consider removing it.";
+ print "WARNING: 'All rights reserved' in copyright may invalidate Open Source license.\n";
}
$self->license($license);
return 1;
@@ -368,4 +464,37 @@
return 'unknown';
}
+sub bugtracker_from {
+ my $self = shift;
+ my $content = Module::Install::_read($_[0]);
+ my @links = $content =~ m/L\<(http\:\/\/rt\.cpan\.org\/[^>]+)\>/g;
+ unless ( @links ) {
+ warn "Cannot determine bugtracker info from $_[0]\n";
+ return 0;
+ }
+ if ( @links > 1 ) {
+ warn "Found more than on rt.cpan.org link in $_[0]\n";
+ return 0;
+ }
+
+ # Set the bugtracker
+ bugtracker( $links[0] );
+ return 1;
+}
+
+sub install_script {
+ my $self = shift;
+ my $args = $self->makemaker_args;
+ my $exe = $args->{EXE_FILES} ||= [];
+ foreach ( @_ ) {
+ if ( -f $_ ) {
+ push @$exe, $_;
+ } elsif ( -d 'script' and -f "script/$_" ) {
+ push @$exe, "script/$_";
+ } else {
+ die("Cannot find script '$_'");
+ }
+ }
+}
+
1;
Modified: branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Win32.pm?rev=24956&op=diff
==============================================================================
--- branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Win32.pm (original)
+++ branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/Win32.pm Tue Sep 9 20:35:26 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.71';
+ $VERSION = '0.77';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/WriteAll.pm?rev=24956&op=diff
==============================================================================
--- branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/WriteAll.pm (original)
+++ branches/upstream/libpoe-component-server-simplehttp-perl/current/inc/Module/Install/WriteAll.pm Tue Sep 9 20:35:26 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.71';
+ $VERSION = '0.77';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: branches/upstream/libpoe-component-server-simplehttp-perl/current/lib/POE/Component/Server/SimpleHTTP.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-server-simplehttp-perl/current/lib/POE/Component/Server/SimpleHTTP.pm?rev=24956&op=diff
==============================================================================
--- branches/upstream/libpoe-component-server-simplehttp-perl/current/lib/POE/Component/Server/SimpleHTTP.pm (original)
+++ branches/upstream/libpoe-component-server-simplehttp-perl/current/lib/POE/Component/Server/SimpleHTTP.pm Tue Sep 9 20:35:26 2008
@@ -3,13 +3,13 @@
# Standard stuff to catch errors
use strict qw(subs vars refs); # Make sure we can't mess up
-use warnings FATAL => 'all'; # Enable warnings to catch errors
+use warnings;
use vars qw($VERSION);
# Initialize our version
# $Revision: 1181 $
-$VERSION = '1.46';
+$VERSION = '1.48';
# Import what we need from the POE namespace
use POE;
@@ -769,20 +769,22 @@
# TODO if we received a malformed request, we will not have a request object
# We need to figure out what we're doing because they can't always expect to have
# a request object, or should we keep it from being ?undef'd?
- $_[KERNEL]->post(
- $_[HEAP]->{'LOGHANDLER'}->{'SESSION'},
- $_[HEAP]->{'LOGHANDLER'}->{'EVENT'},
- $request,
- $response->connection->remote_ip(),
- ) if $_[HEAP]->{'LOGHANDLER'};
-
- # Warn if we had a problem dispatching to the log handler above
- warn("I had a problem posting to event '",
- $_[HEAP]->{'LOGHANDLER'}->{'EVENT'},
- "' of the log handler alias '",
- $_[HEAP]->{'LOGHANDLE'}->{'SESSION'},
- "'. As reported by Kernel: '$!', perhaps the alias is spelled incorrectly for this handler?")
- if $!;
+ if($_[HEAP]->{'LOGHANDLER'}) {
+ $! = undef;
+ $_[KERNEL]->post(
+ $_[HEAP]->{'LOGHANDLER'}->{'SESSION'},
+ $_[HEAP]->{'LOGHANDLER'}->{'EVENT'},
+ $request,
+ $response->connection->remote_ip());
+
+ # Warn if we had a problem dispatching to the log handler above
+ warn("I had a problem posting to event '",
+ $_[HEAP]->{'LOGHANDLER'}->{'EVENT'},
+ "' of the log handler alias '",
+ $_[HEAP]->{'LOGHANDLE'}->{'SESSION'},
+ "'. As reported by Kernel: '$!', perhaps the alias is spelled incorrectly for this handler?")
+ if $!;
+ }
# If we received a malformed request then
@@ -1007,20 +1009,22 @@
$_[HEAP]->{'REQUESTS'}->{ $id }->[1] = 1;
# Log FINALLY If they have a logFinal handler registered, send out the needed information
- $_[KERNEL]->call(
- $_[HEAP]->{'LOG2HANDLER'}->{'SESSION'},
- $_[HEAP]->{'LOG2HANDLER'}->{'EVENT'},
- $_[HEAP]->{'REQUESTS'}{ $id }[3],
- $response)
- if $_[HEAP]->{'LOG2HANDLER'};
-
- # Warn if we had a problem dispatching to the log handler above
- warn("I had a problem posting to event '",
- $_[HEAP]->{'LOG2HANDLER'}->{'EVENT'},
- "' of the log handler alias '",
- $_[HEAP]->{'LOG2HANDLER'}->{'SESSION'},
- "'. As reported by Kernel: '$!', perhaps the alias is spelled incorrectly for this handler?")
- if $!;
+ if($_[HEAP]->{'LOG2HANDLER'}) {
+ $! = undef;
+ $_[KERNEL]->call(
+ $_[HEAP]->{'LOG2HANDLER'}->{'SESSION'},
+ $_[HEAP]->{'LOG2HANDLER'}->{'EVENT'},
+ $_[HEAP]->{'REQUESTS'}{ $id }[3],
+ $response);
+
+ # Warn if we had a problem dispatching to the log handler above
+ warn("I had a problem posting to event '",
+ $_[HEAP]->{'LOG2HANDLER'}->{'EVENT'},
+ "' of the log handler alias '",
+ $_[HEAP]->{'LOG2HANDLER'}->{'SESSION'},
+ "'. As reported by Kernel: '$!', perhaps the alias is spelled incorrectly for this handler?")
+ if $!;
+ }
# Debug stuff
Modified: branches/upstream/libpoe-component-server-simplehttp-perl/current/lib/POE/Component/Server/SimpleHTTP/Connection.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-server-simplehttp-perl/current/lib/POE/Component/Server/SimpleHTTP/Connection.pm?rev=24956&op=diff
==============================================================================
--- branches/upstream/libpoe-component-server-simplehttp-perl/current/lib/POE/Component/Server/SimpleHTTP/Connection.pm (original)
+++ branches/upstream/libpoe-component-server-simplehttp-perl/current/lib/POE/Component/Server/SimpleHTTP/Connection.pm Tue Sep 9 20:35:26 2008
@@ -3,7 +3,7 @@
# Standard stuff to catch errors
use strict qw(subs vars refs); # Make sure we can't mess up
-use warnings FATAL => 'all'; # Enable warnings to catch errors
+use warnings; # Enable warnings to catch errors
# Initialize our version
# $Revision: 1181 $
Modified: branches/upstream/libpoe-component-server-simplehttp-perl/current/lib/POE/Component/Server/SimpleHTTP/PreFork.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-server-simplehttp-perl/current/lib/POE/Component/Server/SimpleHTTP/PreFork.pm?rev=24956&op=diff
==============================================================================
--- branches/upstream/libpoe-component-server-simplehttp-perl/current/lib/POE/Component/Server/SimpleHTTP/PreFork.pm (original)
+++ branches/upstream/libpoe-component-server-simplehttp-perl/current/lib/POE/Component/Server/SimpleHTTP/PreFork.pm Tue Sep 9 20:35:26 2008
@@ -3,7 +3,7 @@
# Standard stuff to catch errors
use strict qw(subs vars refs); # Make sure we can't mess up
-use warnings FATAL => 'all'; # Enable warnings to catch errors
+use warnings; # Enable warnings to catch errors
# Initialize our version
# $Revision: 1181 $
Modified: branches/upstream/libpoe-component-server-simplehttp-perl/current/lib/POE/Component/Server/SimpleHTTP/Response.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-server-simplehttp-perl/current/lib/POE/Component/Server/SimpleHTTP/Response.pm?rev=24956&op=diff
==============================================================================
--- branches/upstream/libpoe-component-server-simplehttp-perl/current/lib/POE/Component/Server/SimpleHTTP/Response.pm (original)
+++ branches/upstream/libpoe-component-server-simplehttp-perl/current/lib/POE/Component/Server/SimpleHTTP/Response.pm Tue Sep 9 20:35:26 2008
@@ -3,7 +3,7 @@
# Standard stuff to catch errors
use strict qw(subs vars refs); # Make sure we can't mess up
-use warnings FATAL => 'all'; # Enable warnings to catch errors
+use warnings; # Enable warnings to catch errors
# Initialize our version
# $Revision: 1181 $
More information about the Pkg-perl-cvs-commits
mailing list