[Catalyst-commits] r7104 - in Catalyst-Runtime/5.80/trunk: .
lib/Catalyst lib/Catalyst/Engine t
andyg at dev.catalyst.perl.org
andyg at dev.catalyst.perl.org
Fri Nov 9 06:01:21 GMT 2007
Author: andyg
Date: 2007-11-09 06:01:21 +0000 (Fri, 09 Nov 2007)
New Revision: 7104
Modified:
Catalyst-Runtime/5.80/trunk/
Catalyst-Runtime/5.80/trunk/Changes
Catalyst-Runtime/5.80/trunk/Makefile.PL
Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine.pm
Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/HTTP.pm
Catalyst-Runtime/5.80/trunk/lib/Catalyst/Test.pm
Catalyst-Runtime/5.80/trunk/t/live_engine_request_parameters.t
Catalyst-Runtime/5.80/trunk/t/live_stats.t
Catalyst-Runtime/5.80/trunk/t/optional_lighttpd-fastcgi-non-root.t
Catalyst-Runtime/5.80/trunk/t/optional_lighttpd-fastcgi.t
Log:
r23216 at macbookpro (orig r7071): jrockway | 2007-10-26 00:50:57 -0400
update Changes to note inclusion of stats
r23245 at macbookpro (orig r7073): andyg | 2007-10-26 14:20:36 -0400
Revert SIGCHLD patch pending a test
r23308 at macbookpro (orig r7076): andyg | 2007-10-29 18:00:00 -0400
Allow for CATALYST_SERVER settings with a trailing slash
r23427 at macbookpro (orig r7086): andyg | 2007-10-31 18:30:49 -0400
Skip the live_stats test on remote servers
r23705 at macbookpro (orig r7090): andyg | 2007-11-05 17:05:19 -0500
Fix lighttpd tests to use correct lib directory
r23858 at macbookpro (orig r7091): ash | 2007-11-06 17:40:39 -0500
Fix warning about resource forks for OSX Leopard
r23868 at macbookpro (orig r7101): miyagawa | 2007-11-09 00:03:54 -0500
fixed a bug in ?q=bar=baz query parameter
r23869 at macbookpro (orig r7102): miyagawa | 2007-11-09 00:57:53 -0500
update Changes
r23870 at macbookpro (orig r7103): andyg | 2007-11-09 01:00:32 -0500
Get rid of hard tabs
Property changes on: Catalyst-Runtime/5.80/trunk
___________________________________________________________________
Name: svk:merge
- 1c72fc7c-9ce4-42af-bf25-3bfe470ff1e8:/local/Catalyst/trunk/Catalyst-Runtime:9763
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/trunk:7069
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-ChildOf:4443
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-Runtime-jrockway:5857
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-component-setup:4320
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-docs:4325
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/current/Catalyst-Runtime:5142
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst:4483
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst-Runtime:6165
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime:8339
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime-jrockway:8342
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime:6511
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime-current:10442
+ 1c72fc7c-9ce4-42af-bf25-3bfe470ff1e8:/local/Catalyst/trunk/Catalyst-Runtime:9763
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/trunk:7103
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-ChildOf:4443
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-Runtime-jrockway:5857
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-component-setup:4320
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-docs:4325
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/current/Catalyst-Runtime:5142
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst:4483
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst-Runtime:6165
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime:8339
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime-jrockway:8342
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime:6511
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime-current:10442
Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes 2007-11-09 06:00:32 UTC (rev 7103)
+++ Catalyst-Runtime/5.80/trunk/Changes 2007-11-09 06:01:21 UTC (rev 7104)
@@ -1,8 +1,9 @@
# This file documents the revision history for Perl extension Catalyst.
5.7012
- - Fixed Engine::HTTP to use a proper SIGCHLD repear. Should fix issues with
- system() calls returning -1 instead of the correct value. (Jon Schutz)
+ - Add Catalyst::Stats (Jon Schutz)
+ - Fixed a bug where ?q=bar=baz is decoded as q=>'bar', not 'bar=baz'.
+ (Tatsuhiko Miyagawa, Masahiro Nagano)
5.7011 2007-10-18 20:40:00
- Allow multiple restart directories and added option to follow
Modified: Catalyst-Runtime/5.80/trunk/Makefile.PL
===================================================================
--- Catalyst-Runtime/5.80/trunk/Makefile.PL 2007-11-09 06:00:32 UTC (rev 7103)
+++ Catalyst-Runtime/5.80/trunk/Makefile.PL 2007-11-09 06:01:21 UTC (rev 7104)
@@ -39,8 +39,15 @@
build_requires 'Test::Pod::Coverage' => 1.04;
if ($^O eq 'darwin') {
- makemaker_args(dist => { PREOP => 'if [ "$$COPY_EXTENDED_ATTRIBUTES_DISABLE" != "true" ]; then'.
- ' echo "you must set the ENV variable COPY_EXTENDED_ATTRIBUTES_DISABLE to true,"; '.
+ my $osx_ver = `/usr/bin/sw_vers -productVersion`;
+ chomp $osx_ver;
+
+ # TAR on 10.4 wants COPY_EXTENDED_ATTRIBUTES_DISABLE
+ # On 10.5 (Leopard) it wants COPYFILE_DISABLE
+ my $attr = $osx_ver eq '10.5' ? 'COPYFILE_DISABLE' : 'COPY_EXTENDED_ATTRIBUTES_DISABLE';
+
+ makemaker_args(dist => { PREOP => qq{\@if [ "\$\$$attr" != "true" ]; then}.
+ qq{ echo "You must set the ENV variable $attr to true,"; }.
' echo "to avoid getting resource forks in your dist."; exit 255; fi' });
}
}
Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/HTTP.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/HTTP.pm 2007-11-09 06:00:32 UTC (rev 7103)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/HTTP.pm 2007-11-09 06:01:21 UTC (rev 7104)
@@ -11,7 +11,6 @@
use Socket;
use IO::Socket::INET ();
use IO::Select ();
-use POSIX ":sys_wait_h";
# For PAR
require Catalyst::Engine::HTTP::Restarter;
@@ -190,7 +189,7 @@
}
my $restart = 0;
- local $SIG{CHLD} = \&_REAPER;
+ local $SIG{CHLD} = 'IGNORE';
my $allowed = $options->{allowed} || { '127.0.0.1' => '255.255.255.255' };
my $addr = $host ? inet_aton($host) : INADDR_ANY;
@@ -526,12 +525,6 @@
sub _inet_addr { unpack "N*", inet_aton( $_[0] ) }
-sub _REAPER {
- my $child;
- while ( ( $child = waitpid( -1,WNOHANG ) ) > 0 ) { }
- $SIG{CHLD} = \&_REAPER;
-}
-
=head1 SEE ALSO
L<Catalyst>, L<Catalyst::Engine>.
Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine.pm 2007-11-09 06:00:32 UTC (rev 7103)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine.pm 2007-11-09 06:01:21 UTC (rev 7104)
@@ -458,7 +458,7 @@
my ($param, $value)
= map { $self->unescape_uri($_) }
- split( /=/, $item );
+ split( /=/, $item, 2 );
$param = $self->unescape_uri($item) unless defined $param;
Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Test.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Test.pm 2007-11-09 06:00:32 UTC (rev 7103)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Test.pm 2007-11-09 06:01:21 UTC (rev 7104)
@@ -135,7 +135,8 @@
my $server = URI->new( $ENV{CATALYST_SERVER} );
if ( $server->path =~ m|^(.+)?/$| ) {
- $server->path("$1"); # need to be quoted
+ my $path = $1;
+ $server->path("$path") if $path; # need to be quoted
}
# the request path needs to be sanitised if $server is using a
Modified: Catalyst-Runtime/5.80/trunk/t/live_engine_request_parameters.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/live_engine_request_parameters.t 2007-11-09 06:00:32 UTC (rev 7103)
+++ Catalyst-Runtime/5.80/trunk/t/live_engine_request_parameters.t 2007-11-09 06:01:21 UTC (rev 7104)
@@ -6,7 +6,7 @@
use FindBin;
use lib "$FindBin::Bin/lib";
-use Test::More tests => 35;
+use Test::More tests => 40;
use Catalyst::Test 'TestApp';
use Catalyst::Request;
@@ -48,7 +48,17 @@
{
my $creq;
+ ok( my $response = request("http://localhost/dump/request?q=foo=bar"),
+ 'Request' );
+ ok( $response->is_success, 'Response Successful 2xx' );
+ is( $response->content_type, 'text/plain', 'Response Content-Type' );
+ ok( eval '$creq = ' . $response->content );
+ is $creq->{parameters}->{q}, 'foo=bar', '= not ignored';
+}
+{
+ my $creq;
+
my $parameters = {
'a' => [qw(A b C d E f G)],
'%' => [ '%', '"', '& - &' ],
Modified: Catalyst-Runtime/5.80/trunk/t/live_stats.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/live_stats.t 2007-11-09 06:00:32 UTC (rev 7103)
+++ Catalyst-Runtime/5.80/trunk/t/live_stats.t 2007-11-09 06:01:21 UTC (rev 7104)
@@ -6,9 +6,16 @@
use FindBin;
use lib "$FindBin::Bin/lib";
-use Test::More tests => 5;
+use Test::More;
use Catalyst::Test 'TestAppStats';
+if ( $ENV{CATALYST_SERVER} ) {
+ plan skip_all => 'Using remote server';
+}
+else {
+ plan tests => 5;
+}
+
{
ok( my $response = request('http://localhost/'), 'Request' );
ok( $response->is_success, 'Response Successful 2xx' );
Modified: Catalyst-Runtime/5.80/trunk/t/optional_lighttpd-fastcgi-non-root.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/optional_lighttpd-fastcgi-non-root.t 2007-11-09 06:00:32 UTC (rev 7103)
+++ Catalyst-Runtime/5.80/trunk/t/optional_lighttpd-fastcgi-non-root.t 2007-11-09 06:01:21 UTC (rev 7104)
@@ -76,12 +76,15 @@
fastcgi.server = (
"/deep/path" => (
"FastCgiTest" => (
- "socket" => "$docroot/test.socket",
- "check-local" => "disable",
- "bin-path" => "$docroot/TestApp/script/testapp_fastcgi.pl",
- "min-procs" => 1,
- "max-procs" => 1,
- "idle-timeout" => 20
+ "socket" => "$docroot/test.socket",
+ "check-local" => "disable",
+ "bin-path" => "$docroot/TestApp/script/testapp_fastcgi.pl",
+ "min-procs" => 1,
+ "max-procs" => 1,
+ "idle-timeout" => 20,
+ "bin-environment" => (
+ "PERL5LIB" => "$docroot/../../lib"
+ )
)
)
)
Modified: Catalyst-Runtime/5.80/trunk/t/optional_lighttpd-fastcgi.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/optional_lighttpd-fastcgi.t 2007-11-09 06:00:32 UTC (rev 7103)
+++ Catalyst-Runtime/5.80/trunk/t/optional_lighttpd-fastcgi.t 2007-11-09 06:01:21 UTC (rev 7104)
@@ -71,12 +71,15 @@
fastcgi.server = (
"" => (
"FastCgiTest" => (
- "socket" => "$docroot/test.socket",
- "check-local" => "disable",
- "bin-path" => "$docroot/TestApp/script/testapp_fastcgi.pl",
- "min-procs" => 1,
- "max-procs" => 1,
- "idle-timeout" => 20
+ "socket" => "$docroot/test.socket",
+ "check-local" => "disable",
+ "bin-path" => "$docroot/TestApp/script/testapp_fastcgi.pl",
+ "min-procs" => 1,
+ "max-procs" => 1,
+ "idle-timeout" => 20,
+ "bin-environment" => (
+ "PERL5LIB" => "$docroot/../../lib"
+ )
)
)
)
More information about the Catalyst-commits
mailing list