diff options
Diffstat (limited to 'dev-perl')
| -rw-r--r-- | dev-perl/HTTP-Server-Simple/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-perl/HTTP-Server-Simple/files/0.36-debian.patch | 91 | ||||
| -rw-r--r-- | dev-perl/HTTP-Server-Simple/files/0.37-debian.patch | 76 |
3 files changed, 5 insertions, 168 deletions
diff --git a/dev-perl/HTTP-Server-Simple/ChangeLog b/dev-perl/HTTP-Server-Simple/ChangeLog index 0390a7d0a030..39c502b55dc8 100644 --- a/dev-perl/HTTP-Server-Simple/ChangeLog +++ b/dev-perl/HTTP-Server-Simple/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-perl/HTTP-Server-Simple # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-Server-Simple/ChangeLog,v 1.37 2009/03/13 12:43:05 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-Server-Simple/ChangeLog,v 1.38 2009/08/16 09:27:18 tove Exp $ + + 16 Aug 2009; Torsten Veller <tove@gentoo.org> -files/0.36-debian.patch, + -files/0.37-debian.patch: + Remove unused patch 13 Mar 2009; Torsten Veller <tove@gentoo.org> -HTTP-Server-Simple-0.36.ebuild, -HTTP-Server-Simple-0.37.ebuild: diff --git a/dev-perl/HTTP-Server-Simple/files/0.36-debian.patch b/dev-perl/HTTP-Server-Simple/files/0.36-debian.patch deleted file mode 100644 index fbb7c443d97a..000000000000 --- a/dev-perl/HTTP-Server-Simple/files/0.36-debian.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- a/t/01live.t -+++ b/t/01live.t -@@ -34,11 +34,7 @@ for my $class (@classes) { - } - - --TODO: { -- local $TODO = "We don't currently wait for 'server is running' responses from the client"; -- run_server_tests('SlowServer'); -- --} -+run_server_tests('SlowServer'); - - - -From: Niko Tyni <ntyni@iki.fi> -Subject: [PATCH] Pipe version: parent waits for the child to say "OK" via a pipe. - ---- libhttp-server-simple-perl.orig/lib/HTTP/Server/Simple.pm -+++ libhttp-server-simple-perl/lib/HTTP/Server/Simple.pm -@@ -6,6 +6,7 @@ - use Socket; - use Carp; - use URI::Escape; -+use IO::Select; - - use vars qw($VERSION $bad_request_doc); - $VERSION = '0.36'; -@@ -206,15 +207,36 @@ - - sub background { - my $self = shift; -+ -+ # set up a pipe so the child can tell the parent when it's ready -+ # to accept requests -+ my ($readfh, $writefh) = FileHandle::pipe; -+ - my $child = fork; - croak "Can't fork: $!" unless defined($child); -- return $child if $child; -+ if ($child) { # parent -+ my $s = IO::Select->new; -+ $s->add($readfh); -+ my $now = time; my $left = 0; -+ my @ready; -+ while(not @ready and $left < 5) { -+ @ready = $s->can_read($left); -+ $left = time - $now; -+ } -+ die("child unresponsive for 5 seconds") if(not @ready); -+ my $response = <$readfh>; -+ chomp $response; -+ die("child is confused: answer '$response' != 'OK'") -+ if $response ne "OK"; -+ return $child; -+ } - - if ( $^O !~ /MSWin32/ ) { - require POSIX; - POSIX::setsid() - or croak "Can't start a new session: $!"; - } -+ $self->{_parent_handle} = $writefh; - $self->run(@_); - } - -@@ -263,6 +285,7 @@ - $self->after_setup_listener(); - *{"$pkg\::run"} = $self->_default_run; - } -+ $self->_maybe_tell_parent(); - - local $SIG{HUP} = sub { $SERVER_SHOULD_RUN = 0; }; - -@@ -400,6 +423,16 @@ - } - } - -+sub _maybe_tell_parent { -+ # inform the parent process that we're ready, if applicable -+ my $self = shift; -+ my $handle = $self->{_parent_handle}; -+ return if !$handle; -+ print $handle "OK\n"; -+ close $handle; -+ delete $self->{_parent_handle}; -+} -+ - =head2 stdio_handle [FILEHANDLE] - - When called with an argument, sets the socket to the server to that arg. diff --git a/dev-perl/HTTP-Server-Simple/files/0.37-debian.patch b/dev-perl/HTTP-Server-Simple/files/0.37-debian.patch deleted file mode 100644 index 65e6dfa3d135..000000000000 --- a/dev-perl/HTTP-Server-Simple/files/0.37-debian.patch +++ /dev/null @@ -1,76 +0,0 @@ -From: Niko Tyni <ntyni@iki.fi> -Subject: [PATCH] Pipe version: parent waits for the child to say "OK" via a pipe. - ---- a/lib/HTTP/Server/Simple.pm -+++ b/lib/HTTP/Server/Simple.pm -@@ -6,6 +6,7 @@ - use Socket; - use Carp; - use URI::Escape; -+use IO::Select; - - use vars qw($VERSION $bad_request_doc); - $VERSION = '0.36'; -@@ -206,15 +207,36 @@ - - sub background { - my $self = shift; -+ -+ # set up a pipe so the child can tell the parent when it's ready -+ # to accept requests -+ my ($readfh, $writefh) = FileHandle::pipe; -+ - my $child = fork; - croak "Can't fork: $!" unless defined($child); -- return $child if $child; -+ if ($child) { # parent -+ my $s = IO::Select->new; -+ $s->add($readfh); -+ my $now = time; my $left = 0; -+ my @ready; -+ while(not @ready and $left < 5) { -+ @ready = $s->can_read($left); -+ $left = time - $now; -+ } -+ die("child unresponsive for 5 seconds") if(not @ready); -+ my $response = <$readfh>; -+ chomp $response; -+ die("child is confused: answer '$response' != 'OK'") -+ if $response ne "OK"; -+ return $child; -+ } - - if ( $^O !~ /MSWin32/ ) { - require POSIX; - POSIX::setsid() - or croak "Can't start a new session: $!"; - } -+ $self->{_parent_handle} = $writefh; - $self->run(@_); - } - -@@ -263,6 +285,7 @@ - $self->after_setup_listener(); - *{"$pkg\::run"} = $self->_default_run; - } -+ $self->_maybe_tell_parent(); - - local $SIG{HUP} = sub { $SERVER_SHOULD_RUN = 0; }; - -@@ -400,6 +423,16 @@ - } - } - -+sub _maybe_tell_parent { -+ # inform the parent process that we're ready, if applicable -+ my $self = shift; -+ my $handle = $self->{_parent_handle}; -+ return if !$handle; -+ print $handle "OK\n"; -+ close $handle; -+ delete $self->{_parent_handle}; -+} -+ - =head2 stdio_handle [FILEHANDLE] - - When called with an argument, sets the socket to the server to that arg. |