r75384 - in /branches/upstream/libcatalyst-engine-psgi-perl/current: ./ inc/Module/ inc/Module/Install/ inc/Test/ inc/Test/Base/ inc/Test/Builder/ lib/Catalyst/Controller/ lib/Catalyst/Engine/ t/ t/Hello/lib/Hello/Controller/

ghedo-guest at users.alioth.debian.org ghedo-guest at users.alioth.debian.org
Sat Jun 11 11:25:47 UTC 2011


Author: ghedo-guest
Date: Sat Jun 11 11:25:37 2011
New Revision: 75384

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=75384
Log:
[svn-upgrade] new version libcatalyst-engine-psgi-perl (0.13+dfsg)

Modified:
    branches/upstream/libcatalyst-engine-psgi-perl/current/Changes
    branches/upstream/libcatalyst-engine-psgi-perl/current/META.yml
    branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install.pm
    branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Base.pm
    branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Can.pm
    branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Fetch.pm
    branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Include.pm
    branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Makefile.pm
    branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Metadata.pm
    branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/TestBase.pm
    branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Win32.pm
    branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/WriteAll.pm
    branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/Base.pm
    branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/Base/Filter.pm
    branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/Builder.pm
    branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/Builder/Module.pm
    branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/More.pm
    branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/SharedFork.pm
    branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/TCP.pm
    branches/upstream/libcatalyst-engine-psgi-perl/current/lib/Catalyst/Controller/Metal.pm
    branches/upstream/libcatalyst-engine-psgi-perl/current/lib/Catalyst/Engine/PSGI.pm
    branches/upstream/libcatalyst-engine-psgi-perl/current/t/Hello/lib/Hello/Controller/Root.pm
    branches/upstream/libcatalyst-engine-psgi-perl/current/t/hello.t

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/Changes?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/Changes (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/Changes Sat Jun 11 11:25:37 2011
@@ -1,4 +1,8 @@
 Revision history for Perl extension Catalyst::Engine::PSGI
+
+0.13  Thu Jun  9 23:58:10 PDT 2011
+        - Fixed a bug in PSGI header generation to prevent potential HTTP header injection
+        - Misc doc fixes
 
 0.12  Thu Jan  6 14:37:53 PST 2011
         - Fix for Catalyst::Runtime >= 5.80030 (pedromelo)

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/META.yml?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/META.yml (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/META.yml Sat Jun 11 11:25:37 2011
@@ -7,7 +7,7 @@
 configure_requires:
   ExtUtils::MakeMaker: 6.42
 distribution_type: module
-generated_by: 'Module::Install version 1.00'
+generated_by: 'Module::Install version 1.01'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -26,4 +26,4 @@
 resources:
   license: http://dev.perl.org/licenses/
   repository: git://github.com/miyagawa/Catalyst-Engine-PSGI.git
-version: 0.12
+version: 0.13

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install.pm?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install.pm (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install.pm Sat Jun 11 11:25:37 2011
@@ -31,7 +31,7 @@
 	# 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 = '1.00';
+	$VERSION = '1.01';
 
 	# Storage for the pseudo-singleton
 	$MAIN    = undef;
@@ -467,4 +467,4 @@
 
 1;
 
-# Copyright 2008 - 2010 Adam Kennedy.
+# Copyright 2008 - 2011 Adam Kennedy.

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Base.pm?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Base.pm (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Base.pm Sat Jun 11 11:25:37 2011
@@ -4,7 +4,7 @@
 use strict 'vars';
 use vars qw{$VERSION};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.01';
 }
 
 # Suspend handler for "redefined" warnings

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Can.pm?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Can.pm (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Can.pm Sat Jun 11 11:25:37 2011
@@ -9,7 +9,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.01';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Fetch.pm?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Fetch.pm (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Fetch.pm Sat Jun 11 11:25:37 2011
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.01';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Include.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Include.pm?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Include.pm (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Include.pm Sat Jun 11 11:25:37 2011
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.01';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Makefile.pm?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Makefile.pm (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Makefile.pm Sat Jun 11 11:25:37 2011
@@ -8,7 +8,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.01';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Metadata.pm?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Metadata.pm (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Metadata.pm Sat Jun 11 11:25:37 2011
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.01';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
@@ -515,6 +515,7 @@
 		'GNU Free Documentation license'     => 'unrestricted', 1,
 		'GNU Affero General Public License'  => 'open_source',  1,
 		'(?:Free)?BSD license'               => 'bsd',          1,
+		'Artistic license 2\.0'              => 'artistic_2',   1,
 		'Artistic license'                   => 'artistic',     1,
 		'Apache (?:Software )?license'       => 'apache',       1,
 		'GPL'                                => 'gpl',          1,
@@ -550,9 +551,9 @@
 
 sub _extract_bugtracker {
 	my @links   = $_[0] =~ m#L<(
-	 \Qhttp://rt.cpan.org/\E[^>]+|
-	 \Qhttp://github.com/\E[\w_]+/[\w_]+/issues|
-	 \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list
+	 https?\Q://rt.cpan.org/\E[^>]+|
+	 https?\Q://github.com/\E[\w_]+/[\w_]+/issues|
+	 https?\Q://code.google.com/p/\E[\w_\-]+/issues/list
 	 )>#gx;
 	my %links;
 	@links{@links}=();

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/TestBase.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/TestBase.pm?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/TestBase.pm (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/TestBase.pm Sat Jun 11 11:25:37 2011
@@ -7,7 +7,7 @@
 
 use vars qw($VERSION @ISA);
 BEGIN {
-    $VERSION = '0.11';
+    $VERSION = '0.60';
     @ISA     = 'Module::Install::Base';
 }
 

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Win32.pm?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Win32.pm (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/Win32.pm Sat Jun 11 11:25:37 2011
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.01';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/WriteAll.pm?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/WriteAll.pm (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Module/Install/WriteAll.pm Sat Jun 11 11:25:37 2011
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.01';
 	@ISA     = qw{Module::Install::Base};
 	$ISCORE  = 1;
 }

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/Base.pm?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/Base.pm (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/Base.pm Sat Jun 11 11:25:37 2011
@@ -1,11 +1,9 @@
 #line 1
-# TODO:
-#
 package Test::Base;
 use 5.006001;
 use Spiffy 0.30 -Base;
 use Spiffy ':XXX';
-our $VERSION = '0.59';
+our $VERSION = '0.60';
 
 my @test_more_exports;
 BEGIN {
@@ -536,7 +534,7 @@
 sub tie_output() {
     my $handle = shift;
     die "No buffer to tie" unless @_;
-    tie $handle, 'Test::Base::Handle', $_[0];
+    tie *$handle, 'Test::Base::Handle', $_[0];
 }
 
 sub no_diff {
@@ -681,4 +679,4 @@
 
 =encoding utf8
 
-#line 1376
+#line 1374

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/Base/Filter.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/Base/Filter.pm?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/Base/Filter.pm (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/Base/Filter.pm Sat Jun 11 11:25:37 2011
@@ -1,7 +1,4 @@
 #line 1
-#. TODO:
-#.
-
 #===============================================================================
 # This is the default class for handling Test::Base data filtering.
 #===============================================================================
@@ -341,4 +338,4 @@
 
 __DATA__
 
-#line 639
+#line 636

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/Builder.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/Builder.pm?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/Builder.pm (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/Builder.pm Sat Jun 11 11:25:37 2011
@@ -5,7 +5,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '0.96';
+our $VERSION = '0.98';
 $VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
 
 BEGIN {
@@ -191,6 +191,8 @@
     if( $self->{Child_Name} ) {
         $self->croak("Can't call finalize() with child ($self->{Child_Name}) active");
     }
+
+    local $? = 0;     # don't fail if $subtests happened to set $? nonzero
     $self->_ending;
 
     # XXX This will only be necessary for TAP envelopes (we think)
@@ -224,11 +226,11 @@
     return $self->{Indent};
 }
 
-#line 357
+#line 359
 
 sub parent { shift->{Parent} }
 
-#line 369
+#line 371
 
 sub name { shift->{Name} }
 
@@ -244,7 +246,7 @@
     }
 }
 
-#line 393
+#line 395
 
 our $Level;
 
@@ -291,7 +293,7 @@
     return;
 }
 
-#line 472
+#line 474
 
 my %plan_cmds = (
     no_plan     => \&no_plan,
@@ -338,7 +340,7 @@
     return;
 }
 
-#line 527
+#line 529
 
 sub expected_tests {
     my $self = shift;
@@ -356,7 +358,7 @@
     return $self->{Expected_Tests};
 }
 
-#line 551
+#line 553
 
 sub no_plan {
     my($self, $arg) = @_;
@@ -369,7 +371,7 @@
     return 1;
 }
 
-#line 584
+#line 586
 
 sub _output_plan {
     my($self, $max, $directive, $reason) = @_;
@@ -388,7 +390,7 @@
 }
 
 
-#line 636
+#line 638
 
 sub done_testing {
     my($self, $num_tests) = @_;
@@ -431,7 +433,7 @@
 }
 
 
-#line 687
+#line 689
 
 sub has_plan {
     my $self = shift;
@@ -441,7 +443,7 @@
     return(undef);
 }
 
-#line 704
+#line 706
 
 sub skip_all {
     my( $self, $reason ) = @_;
@@ -455,7 +457,7 @@
     exit(0);
 }
 
-#line 729
+#line 731
 
 sub exported_to {
     my( $self, $pack ) = @_;
@@ -466,7 +468,7 @@
     return $self->{Exported_To};
 }
 
-#line 759
+#line 761
 
 sub ok {
     my( $self, $test, $name ) = @_;
@@ -626,7 +628,7 @@
     return $numval != 0 and $numval ne $val ? 1 : 0;
 }
 
-#line 933
+#line 939
 
 sub is_eq {
     my( $self, $got, $expect, $name ) = @_;
@@ -705,7 +707,7 @@
 DIAGNOSTIC
 }
 
-#line 1026
+#line 1032
 
 sub isnt_eq {
     my( $self, $got, $dont_expect, $name ) = @_;
@@ -739,7 +741,7 @@
     return $self->cmp_ok( $got, '!=', $dont_expect, $name );
 }
 
-#line 1075
+#line 1081
 
 sub like {
     my( $self, $this, $regex, $name ) = @_;
@@ -755,7 +757,7 @@
     return $self->_regex_ok( $this, $regex, '!~', $name );
 }
 
-#line 1099
+#line 1105
 
 my %numeric_cmps = map { ( $_, 1 ) } ( "<", "<=", ">", ">=", "==", "!=", "<=>" );
 
@@ -836,7 +838,7 @@
     return $code;
 }
 
-#line 1199
+#line 1205
 
 sub BAIL_OUT {
     my( $self, $reason ) = @_;
@@ -846,14 +848,14 @@
     exit 255;
 }
 
-#line 1212
+#line 1218
 
 {
     no warnings 'once';
     *BAILOUT = \&BAIL_OUT;
 }
 
-#line 1226
+#line 1232
 
 sub skip {
     my( $self, $why ) = @_;
@@ -884,7 +886,7 @@
     return 1;
 }
 
-#line 1267
+#line 1273
 
 sub todo_skip {
     my( $self, $why ) = @_;
@@ -912,7 +914,7 @@
     return 1;
 }
 
-#line 1347
+#line 1353
 
 sub maybe_regex {
     my( $self, $regex ) = @_;
@@ -992,7 +994,7 @@
 # I'm not ready to publish this.  It doesn't deal with array return
 # values from the code or context.
 
-#line 1443
+#line 1449
 
 sub _try {
     my( $self, $code, %opts ) = @_;
@@ -1012,7 +1014,7 @@
     return wantarray ? ( $return, $error ) : $return;
 }
 
-#line 1472
+#line 1478
 
 sub is_fh {
     my $self     = shift;
@@ -1026,7 +1028,7 @@
            eval { tied($maybe_fh)->can('TIEHANDLE') };
 }
 
-#line 1515
+#line 1521
 
 sub level {
     my( $self, $level ) = @_;
@@ -1037,7 +1039,7 @@
     return $Level;
 }
 
-#line 1547
+#line 1553
 
 sub use_numbers {
     my( $self, $use_nums ) = @_;
@@ -1048,7 +1050,7 @@
     return $self->{Use_Nums};
 }
 
-#line 1580
+#line 1586
 
 foreach my $attribute (qw(No_Header No_Ending No_Diag)) {
     my $method = lc $attribute;
@@ -1066,7 +1068,7 @@
     *{ __PACKAGE__ . '::' . $method } = $code;
 }
 
-#line 1633
+#line 1639
 
 sub diag {
     my $self = shift;
@@ -1074,7 +1076,7 @@
     $self->_print_comment( $self->_diag_fh, @_ );
 }
 
-#line 1648
+#line 1654
 
 sub note {
     my $self = shift;
@@ -1111,7 +1113,7 @@
     return 0;
 }
 
-#line 1698
+#line 1704
 
 sub explain {
     my $self = shift;
@@ -1130,7 +1132,7 @@
     } @_;
 }
 
-#line 1727
+#line 1733
 
 sub _print {
     my $self = shift;
@@ -1159,7 +1161,7 @@
     return print $fh $indent, $msg;
 }
 
-#line 1787
+#line 1793
 
 sub output {
     my( $self, $fh ) = @_;
@@ -1255,8 +1257,8 @@
     open( $Testout, ">&STDOUT" ) or die "Can't dup STDOUT:  $!";
     open( $Testerr, ">&STDERR" ) or die "Can't dup STDERR:  $!";
 
-    #    $self->_copy_io_layers( \*STDOUT, $Testout );
-    #    $self->_copy_io_layers( \*STDERR, $Testerr );
+    $self->_copy_io_layers( \*STDOUT, $Testout );
+    $self->_copy_io_layers( \*STDERR, $Testerr );
 
     $self->{Opened_Testhandles} = 1;
 
@@ -1271,14 +1273,22 @@
             require PerlIO;
             my @src_layers = PerlIO::get_layers($src);
 
-            binmode $dst, join " ", map ":$_", @src_layers if @src_layers;
+            _apply_layers($dst, @src_layers) if @src_layers;
         }
     );
 
     return;
 }
 
-#line 1912
+sub _apply_layers {
+    my ($fh, @layers) = @_;
+    my %seen;
+    my @unique = grep { $_ ne 'unix' and !$seen{$_}++ } @layers;
+    binmode($fh, join(":", "", "raw", @unique));
+}
+
+
+#line 1926
 
 sub reset_outputs {
     my $self = shift;
@@ -1290,7 +1300,7 @@
     return;
 }
 
-#line 1938
+#line 1952
 
 sub _message_at_caller {
     my $self = shift;
@@ -1311,7 +1321,7 @@
 }
 
 
-#line 1978
+#line 1992
 
 sub current_test {
     my( $self, $num ) = @_;
@@ -1344,7 +1354,7 @@
     return $self->{Curr_Test};
 }
 
-#line 2026
+#line 2040
 
 sub is_passing {
     my $self = shift;
@@ -1357,7 +1367,7 @@
 }
 
 
-#line 2048
+#line 2062
 
 sub summary {
     my($self) = shift;
@@ -1365,14 +1375,14 @@
     return map { $_->{'ok'} } @{ $self->{Test_Results} };
 }
 
-#line 2103
+#line 2117
 
 sub details {
     my $self = shift;
     return @{ $self->{Test_Results} };
 }
 
-#line 2132
+#line 2146
 
 sub todo {
     my( $self, $pack ) = @_;
@@ -1386,7 +1396,7 @@
     return '';
 }
 
-#line 2159
+#line 2173
 
 sub find_TODO {
     my( $self, $pack, $set, $new_value ) = @_;
@@ -1400,7 +1410,7 @@
     return $old_value;
 }
 
-#line 2179
+#line 2193
 
 sub in_todo {
     my $self = shift;
@@ -1409,7 +1419,7 @@
     return( defined $self->{Todo} || $self->find_TODO ) ? 1 : 0;
 }
 
-#line 2229
+#line 2243
 
 sub todo_start {
     my $self = shift;
@@ -1424,7 +1434,7 @@
     return;
 }
 
-#line 2251
+#line 2265
 
 sub todo_end {
     my $self = shift;
@@ -1445,7 +1455,7 @@
     return;
 }
 
-#line 2284
+#line 2298
 
 sub caller {    ## no critic (Subroutines::ProhibitBuiltinHomonyms)
     my( $self, $height ) = @_;
@@ -1460,9 +1470,9 @@
     return wantarray ? @caller : $caller[0];
 }
 
-#line 2301
-
 #line 2315
+
+#line 2329
 
 #'#
 sub _sanity_check {
@@ -1475,7 +1485,7 @@
     return;
 }
 
-#line 2336
+#line 2350
 
 sub _whoa {
     my( $self, $check, $desc ) = @_;
@@ -1490,7 +1500,7 @@
     return;
 }
 
-#line 2360
+#line 2374
 
 sub _my_exit {
     $? = $_[0];    ## no critic (Variables::RequireLocalizedPunctuationVars)
@@ -1498,7 +1508,7 @@
     return 1;
 }
 
-#line 2372
+#line 2386
 
 sub _ending {
     my $self = shift;
@@ -1617,7 +1627,7 @@
     $Test->_ending if defined $Test;
 }
 
-#line 2560
+#line 2574
 
 1;
 

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/Builder/Module.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/Builder/Module.pm?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/Builder/Module.pm (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/Builder/Module.pm Sat Jun 11 11:25:37 2011
@@ -8,7 +8,7 @@
 require Exporter;
 our @ISA = qw(Exporter);
 
-our $VERSION = '0.96';
+our $VERSION = '0.98';
 $VERSION = eval $VERSION;      ## no critic (BuiltinFunctions::ProhibitStringyEval)
 
 

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/More.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/More.pm?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/More.pm (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/More.pm Sat Jun 11 11:25:37 2011
@@ -18,7 +18,7 @@
     return warn @_, " at $file line $line\n";
 }
 
-our $VERSION = '0.96';
+our $VERSION = '0.98';
 $VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
 
 use Test::Builder::Module;
@@ -88,7 +88,7 @@
     return $tb->ok( $test, $name );
 }
 
-#line 367
+#line 372
 
 sub is ($$;$) {
     my $tb = Test::More->builder;
@@ -104,7 +104,7 @@
 
 *isn't = \&isnt;
 
-#line 411
+#line 416
 
 sub like ($$;$) {
     my $tb = Test::More->builder;
@@ -112,7 +112,7 @@
     return $tb->like(@_);
 }
 
-#line 426
+#line 431
 
 sub unlike ($$;$) {
     my $tb = Test::More->builder;
@@ -120,7 +120,7 @@
     return $tb->unlike(@_);
 }
 
-#line 471
+#line 476
 
 sub cmp_ok($$$;$) {
     my $tb = Test::More->builder;
@@ -128,7 +128,7 @@
     return $tb->cmp_ok(@_);
 }
 
-#line 506
+#line 511
 
 sub can_ok ($@) {
     my( $proto, @methods ) = @_;
@@ -162,7 +162,7 @@
     return $ok;
 }
 
-#line 572
+#line 577
 
 sub isa_ok ($$;$) {
     my( $object, $class, $obj_name ) = @_;
@@ -222,7 +222,7 @@
     return $ok;
 }
 
-#line 651
+#line 656
 
 sub new_ok {
     my $tb = Test::More->builder;
@@ -247,16 +247,16 @@
     return $obj;
 }
 
-#line 736
-
-sub subtest($&) {
+#line 741
+
+sub subtest {
     my ($name, $subtests) = @_;
 
     my $tb = Test::More->builder;
     return $tb->subtest(@_);
 }
 
-#line 760
+#line 765
 
 sub pass (;$) {
     my $tb = Test::More->builder;
@@ -270,7 +270,7 @@
     return $tb->ok( 0, @_ );
 }
 
-#line 823
+#line 833
 
 sub use_ok ($;@) {
     my( $module, @imports ) = @_;
@@ -332,7 +332,7 @@
     return( $eval_result, $eval_error );
 }
 
-#line 892
+#line 902
 
 sub require_ok ($) {
     my($module) = shift;
@@ -376,7 +376,7 @@
     return $module =~ /^[a-zA-Z]\w*$/ ? 1 : 0;
 }
 
-#line 969
+#line 979
 
 our( @Data_Stack, %Refs_Seen );
 my $DNE = bless [], 'Does::Not::Exist';
@@ -483,7 +483,7 @@
     return '';
 }
 
-#line 1129
+#line 1139
 
 sub diag {
     return Test::More->builder->diag(@_);
@@ -493,13 +493,13 @@
     return Test::More->builder->note(@_);
 }
 
-#line 1155
+#line 1165
 
 sub explain {
     return Test::More->builder->explain(@_);
 }
 
-#line 1221
+#line 1231
 
 ## no critic (Subroutines::RequireFinalReturn)
 sub skip {
@@ -527,7 +527,7 @@
     last SKIP;
 }
 
-#line 1305
+#line 1315
 
 sub todo_skip {
     my( $why, $how_many ) = @_;
@@ -548,7 +548,7 @@
     last TODO;
 }
 
-#line 1360
+#line 1370
 
 sub BAIL_OUT {
     my $reason = shift;
@@ -557,7 +557,7 @@
     $tb->BAIL_OUT($reason);
 }
 
-#line 1399
+#line 1409
 
 #'#
 sub eq_array {
@@ -697,7 +697,7 @@
     }
 }
 
-#line 1546
+#line 1556
 
 sub eq_hash {
     local @Data_Stack = ();
@@ -732,7 +732,7 @@
     return $ok;
 }
 
-#line 1605
+#line 1615
 
 sub eq_set {
     my( $a1, $a2 ) = @_;
@@ -757,6 +757,6 @@
     );
 }
 
-#line 1807
+#line 1817
 
 1;

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/SharedFork.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/SharedFork.pm?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/SharedFork.pm (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/SharedFork.pm Sat Jun 11 11:25:37 2011
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 use base 'Test::Builder::Module';
-our $VERSION = '0.15';
+our $VERSION = '0.16';
 use Test::Builder 0.32; # 0.32 or later is needed
 use Test::SharedFork::Scalar;
 use Test::SharedFork::Array;
@@ -128,4 +128,4 @@
 1;
 __END__
 
-#line 183
+#line 184

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/TCP.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/TCP.pm?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/TCP.pm (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/inc/Test/TCP.pm Sat Jun 11 11:25:37 2011
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 use 5.00800;
-our $VERSION = '1.11';
+our $VERSION = '1.13';
 use base qw/Exporter/;
 use IO::Socket::INET;
 use Test::SharedFork 0.12;
@@ -18,18 +18,20 @@
 # process does not die when received SIGTERM, on win32.
 my $TERMSIG = $^O eq 'MSWin32' ? 'KILL' : 'TERM';
 
+# get a empty port on 49152 .. 65535
+# http://www.iana.org/assignments/port-numbers
 sub empty_port {
     my $port = do {
         if (@_) {
             my $p = $_[0];
-            $p = 19000 unless $p =~ /^[0-9]+$/ && $p < 19000;
+            $p = 49152 unless $p =~ /^[0-9]+$/ && $p < 49152;
             $p;
         } else {
-            10000 + int(rand()*1000);
+            50000 + int(rand()*1000);
         }
     };
 
-    while ( $port++ < 20000 ) {
+    while ( $port++ < 60000 ) {
         next if _check_port($port);
         my $sock = IO::Socket::INET->new(
             Listen    => 5,
@@ -109,12 +111,16 @@
     my $self = shift;
     if ( my $pid = fork() ) {
         # parent.
+        $self->{pid} = $pid;
         Test::TCP::wait_port($self->port);
-        $self->{pid} = $pid;
         return;
     } elsif ($pid == 0) {
         # child process
         $self->{code}->($self->port);
+        # should not reach here
+        if (kill 0, $self->{_my_pid}) { # warn only parent process still exists
+            warn("[Test::TCP] Child process does not block(PID: $$, PPID: $self->{_my_pid})");
+        }
         exit 0;
     } else {
         die "fork failed: $!";
@@ -127,7 +133,22 @@
     return unless defined $self->{pid};
     return unless $self->{_my_pid} == $$;
 
-    kill $TERMSIG => $self->{pid};
+    # This is a workaround for win32 fork emulation's bug.
+    #
+    # kill is inherently unsafe for pseudo-processes in Windows
+    # and the process calling kill(9, $pid) may be destabilized
+    # The call to Sleep will decrease the frequency of this problems
+    #
+    # SEE ALSO:
+    #   http://www.gossamer-threads.com/lists/perl/porters/261805
+    #   https://rt.cpan.org/Ticket/Display.html?id=67292
+    Win32::Sleep(0) if $^O eq "MSWin32"; # will relinquish the remainder of its time slice
+
+        kill $TERMSIG => $self->{pid};
+
+    Win32::Sleep(0) if $^O eq "MSWin32"; # will relinquish the remainder of its time slice
+
+
     local $?; # waitpid modifies original $?.
     LOOP: while (1) {
         my $kid = waitpid( $self->{pid}, 0 );
@@ -157,4 +178,4 @@
 
 =encoding utf8
 
-#line 381
+#line 406

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/lib/Catalyst/Controller/Metal.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/lib/Catalyst/Controller/Metal.pm?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/lib/Catalyst/Controller/Metal.pm (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/lib/Catalyst/Controller/Metal.pm Sat Jun 11 11:25:37 2011
@@ -41,7 +41,7 @@
 
 Catalyst::Controller::Metal allows you to write a raw PSGI handler in
 your Catalyst application, inspired by Rails Metal that allows you to
-write raw Rack application inside Ruby on Rails.
+write raw Rack applications inside Ruby on Rails.
 
 =head1 SEE ALSO
 

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/lib/Catalyst/Engine/PSGI.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/lib/Catalyst/Engine/PSGI.pm?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/lib/Catalyst/Engine/PSGI.pm (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/lib/Catalyst/Engine/PSGI.pm Sat Jun 11 11:25:37 2011
@@ -2,7 +2,7 @@
 
 use strict;
 use 5.008_001;
-our $VERSION = '0.12';
+our $VERSION = '0.13';
 
 use Moose;
 extends 'Catalyst::Engine';
@@ -187,8 +187,15 @@
     }
 
     my $headers = [];
-    $c->res->headers->scan(sub { push @$headers, @_ });
+    $c->res->headers->scan(sub { my($k, $v) = @_; push @$headers, $k, _escape($v) });
     return [ $c->res->status, $headers, $body ];
+}
+
+sub _escape {
+    local $_ = shift;
+    s/(\r?\n)+/ /g;
+    s/ +/ /g;
+    return $_;
 }
 
 no Moose;
@@ -217,19 +224,19 @@
 
 Catalyst::Engine::PSGI is a Catalyst Engine that adapts Catalyst into the PSGI gateway protocol.
 
-=head1 COMPATIBLITY
+=head1 COMPATIBILITY
 
 =over 4
 
 =item *
 
-Currently this engine works with Catlayst 5.8 (Catamoose) or over.
+Currently this engine works with Catalyst 5.8 (Catamoose) or newer.
 
 =item *
 
 Your application is supposed to work with any PSGI servers without any
 code modifications, but if your application uses C<< $c->res->write >>
-to do streamin write, this engine would buffer the ouput until your
+to do streaming write, this engine will buffer the ouput until your
 app finishes.
 
 To do real streaming with this engine, you should implement an
@@ -237,7 +244,7 @@
 chunk or undef when done, and set that object to C<< $c->res->body >>.
 
 Alternatively, it is possible to set the body to a code reference,
-which will be used to steam content as documented in the
+which will be used to stream content as documented in the
 L<PSGI spec|PSGI/Delayed_Reponse_and_Streaming_Body>.
 
 =item *

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/t/Hello/lib/Hello/Controller/Root.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/t/Hello/lib/Hello/Controller/Root.pm?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/t/Hello/lib/Hello/Controller/Root.pm (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/t/Hello/lib/Hello/Controller/Root.pm Sat Jun 11 11:25:37 2011
@@ -40,6 +40,12 @@
     $c->res->body("Hello " . $c->req->param('name'));
 }
 
+sub headers :Local {
+    my( $self, $c ) = @_;
+    $c->res->header("X-Foo" => "bar\r\n\r\nbaz");
+    $c->res->body("blah");
+}
+
 sub default :Path {
     my ( $self, $c ) = @_;
     $c->response->body( 'Page not found' );

Modified: branches/upstream/libcatalyst-engine-psgi-perl/current/t/hello.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-engine-psgi-perl/current/t/hello.t?rev=75384&op=diff
==============================================================================
--- branches/upstream/libcatalyst-engine-psgi-perl/current/t/hello.t (original)
+++ branches/upstream/libcatalyst-engine-psgi-perl/current/t/hello.t Sat Jun 11 11:25:37 2011
@@ -26,6 +26,10 @@
 
         $res = $ua->get("http://127.0.0.1:$port/metal");
         like $res->content, qr/Hello Metal/;
+
+        $res = $ua->get("http://127.0.0.1:$port/headers");
+        is $res->content, 'blah';
+        like $res->header('X-Foo'), qr/^bar\s+baz$/;
     },
     server => sub {
         my $port = shift;




More information about the Pkg-perl-cvs-commits mailing list