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

christine at users.alioth.debian.org christine at users.alioth.debian.org
Tue Aug 18 14:30:13 UTC 2009


Author: christine
Date: Tue Aug 18 14:29:57 2009
New Revision: 42055

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=42055
Log:
releasing version 0.40-1

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=42055&op=diff
==============================================================================
--- trunk/libhttp-server-simple-perl/debian/changelog (original)
+++ trunk/libhttp-server-simple-perl/debian/changelog Tue Aug 18 14:29:57 2009
@@ -1,4 +1,4 @@
-libhttp-server-simple-perl (0.40-1) UNRELEASED; urgency=low
+libhttp-server-simple-perl (0.40-1) unstable; urgency=low
 
   [ Nathan Handler ]
   * debian/watch: Update to ignore development releases.
@@ -13,8 +13,9 @@
   * Drop versioning in perl dependency; perl in oldstable meets the
     requirement.
   * Add myself to Uploaders
-
- -- Christine Spang <christine at debian.org>  Tue, 18 Aug 2009 09:53:22 -0400
+  * Refresh 0002-Pipe-version-parent-waits-for-the-child-to-say-OK.patch
+
+ -- Christine Spang <christine at debian.org>  Tue, 18 Aug 2009 10:29:39 -0400
 
 libhttp-server-simple-perl (0.38-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=42055&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 Tue Aug 18 14:29:57 2009
@@ -1,8 +1,10 @@
 From: Niko Tyni <ntyni at 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
+Index: libhttp-server-simple-perl/lib/HTTP/Server/Simple.pm
+===================================================================
+--- libhttp-server-simple-perl.orig/lib/HTTP/Server/Simple.pm	2009-08-18 09:48:37.000000000 -0400
++++ libhttp-server-simple-perl/lib/HTTP/Server/Simple.pm	2009-08-18 10:20:50.000000000 -0400
 @@ -6,6 +6,7 @@
  use Socket;
  use Carp;
@@ -10,8 +12,8 @@
 +use IO::Select;
  
  use vars qw($VERSION $bad_request_doc);
- $VERSION = '0.38';
-@@ -206,15 +207,36 @@
+ $VERSION = '0.40';
+@@ -206,9 +207,30 @@
  
  sub background {
      my $self  = shift;
@@ -23,6 +25,7 @@
      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);
@@ -40,16 +43,18 @@
 +        return $child;
 +    }
  
-     if ( $^O !~ /MSWin32/ ) {
-         require POSIX;
+     srand(); # after a fork, we need to reset the random seed
+              # or we'll get the same numbers in both branches
+@@ -217,6 +239,8 @@
          POSIX::setsid()
              or croak "Can't start a new session: $!";
      }
++
 +    $self->{_parent_handle} = $writefh;
-     $self->run(@_);
+     $self->run(@_); # should never return
+     exit;           # just to be sure
  }
- 
-@@ -263,6 +285,7 @@
+@@ -266,6 +290,7 @@
  	$self->after_setup_listener();
          *{"$pkg\::run"} = $self->_default_run;
      }
@@ -57,7 +62,7 @@
  
      local $SIG{HUP} = sub { $SERVER_SHOULD_RUN = 0; };
  
-@@ -400,6 +423,16 @@
+@@ -403,6 +428,16 @@
      }
  }
  




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