r27242 - in /trunk/libhttp-server-simple-perl/debian: changelog patches/0002-Pipe-version-parent-waits-for-the-child-to-say-OK.patch

[ansgar-guest at users.alioth.debian.org]

Author: ansgar-guest
Date: Mon Nov 24 11:40:03 2008
New Revision: 27242

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=27242
Log:
Refresh patches.

Modified:
    trunk/libhttp-server-simple-perl/debian/changelog
    trunk/libhttp-server-simple-perl/debian/patches/0002-Pipe-version-parent-waits-for-the-child-to-say-OK.patch

Modified: trunk/libhttp-server-simple-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-server-simple-perl/debian/changelog?rev=27242&op=diff
==============================================================================
--- trunk/libhttp-server-simple-perl/debian/changelog (original)
+++ trunk/libhttp-server-simple-perl/debian/changelog Mon Nov 24 11:40:03 2008
@@ -1,14 +1,15 @@
-libhttp-server-simple-perl (0.36-1) UNRELEASED; urgency=low
+libhttp-server-simple-perl (0.36-1) unstable; urgency=low
 
   [ Ansgar Burchardt ]
   * debian/copyright: Replace <Tab> with spaces
   * New upstream release.
+    + Refresh patches.
 
   [ gregor herrmann ]
   * debian/control: Changed: Switched Vcs-Browser field to ViewSVN
     (source stanza).
 
- -- Ansgar Burchardt <ansgar at 43-1.org>  Mon, 24 Nov 2008 11:36:21 +0100
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Mon, 24 Nov 2008 12:39:36 +0100
 
 libhttp-server-simple-perl (0.35-1) unstable; urgency=low
 

Modified: trunk/libhttp-server-simple-perl/debian/patches/0002-Pipe-version-parent-waits-for-the-child-to-say-OK.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-server-simple-perl/debian/patches/0002-Pipe-version-parent-waits-for-the-child-to-say-OK.patch?rev=27242&op=diff
==============================================================================
--- trunk/libhttp-server-simple-perl/debian/patches/0002-Pipe-version-parent-waits-for-the-child-to-say-OK.patch (original)
+++ trunk/libhttp-server-simple-perl/debian/patches/0002-Pipe-version-parent-waits-for-the-child-to-say-OK.patch Mon Nov 24 11:40:03 2008
@@ -10,8 +10,8 @@
 +use IO::Select;
  
  use vars qw($VERSION $bad_request_doc);
- $VERSION = '0.35';
-@@ -215,15 +216,36 @@
+ $VERSION = '0.36';
+@@ -206,15 +207,36 @@
  
  sub background {
      my $self  = shift;
@@ -21,17 +21,17 @@
 +    my ($readfh, $writefh) = FileHandle::pipe;
 +
      my $child = fork;
-     die "Can't fork: $!" unless defined($child);
+     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;
-+	}
++        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;
@@ -43,13 +43,13 @@
      if ( $^O !~ /MSWin32/ ) {
          require POSIX;
          POSIX::setsid()
-             or die "Can't start a new session: $!";
+             or croak "Can't start a new session: $!";
      }
 +    $self->{_parent_handle} = $writefh;
      $self->run(@_);
  }
  
-@@ -270,6 +292,7 @@
+@@ -263,6 +285,7 @@
  	$self->after_setup_listener();
          *{"$pkg\::run"} = $self->_default_run;
      }
@@ -57,8 +57,8 @@
  
      local $SIG{HUP} = sub { $SERVER_SHOULD_RUN = 0; };
  
-@@ -407,6 +430,15 @@
-         }
+@@ -400,6 +423,16 @@
+     }
  }
  
 +sub _maybe_tell_parent {
@@ -70,6 +70,7 @@
 +    close $handle;
 +    delete $self->{_parent_handle};
 +}
++
+ =head2 stdio_handle [FILEHANDLE]
  
- 
- 
+ When called with an argument, sets the socket to the server to that arg.