r17785 - in /trunk/libhttp-server-simple-perl/debian: changelog patches/0001-add-testcase-for-CPAN-28122.patch patches/0002-Signal-version-child-sends-SIGUSR1-to-the-parent-wh.patch

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

Author: gregoa-guest
Date: Tue Mar 18 03:52:13 2008
New Revision: 17785

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=17785
Log:
Adjust and refresh patches.

Modified:
    trunk/libhttp-server-simple-perl/debian/changelog
    trunk/libhttp-server-simple-perl/debian/patches/0001-add-testcase-for-CPAN-28122.patch
    trunk/libhttp-server-simple-perl/debian/patches/0002-Signal-version-child-sends-SIGUSR1-to-the-parent-wh.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=17785&op=diff
==============================================================================
--- trunk/libhttp-server-simple-perl/debian/changelog (original)
+++ trunk/libhttp-server-simple-perl/debian/changelog Tue Mar 18 03:52:13 2008
@@ -1,8 +1,9 @@
 libhttp-server-simple-perl (0.31-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Adjust and refresh patches.
 
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 18 Mar 2008 04:40:09 +0100
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 18 Mar 2008 04:51:19 +0100
 
 libhttp-server-simple-perl (0.30-1) unstable; urgency=low
 

Modified: trunk/libhttp-server-simple-perl/debian/patches/0001-add-testcase-for-CPAN-28122.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-server-simple-perl/debian/patches/0001-add-testcase-for-CPAN-28122.patch?rev=17785&op=diff
==============================================================================
--- trunk/libhttp-server-simple-perl/debian/patches/0001-add-testcase-for-CPAN-28122.patch (original)
+++ trunk/libhttp-server-simple-perl/debian/patches/0001-add-testcase-for-CPAN-28122.patch Tue Mar 18 03:52:13 2008
@@ -7,10 +7,8 @@
  t/01live.t |   22 ++++++++++++++++++----
  1 files changed, 18 insertions(+), 4 deletions(-)
 
-diff --git a/t/01live.t b/t/01live.t
-index 0e91384..5e8effc 100644
---- a/t/01live.t
-+++ b/t/01live.t
+--- libhttp-server-simple-perl.orig/t/01live.t
++++ libhttp-server-simple-perl/t/01live.t
 @@ -1,7 +1,7 @@
  # -*- perl -*-
  
@@ -20,7 +18,7 @@
  use strict;
  
  # This script assumes that `localhost' will resolve to a local IP
-@@ -11,16 +11,31 @@ use constant PORT => 13432;
+@@ -12,16 +12,31 @@
  
  use HTTP::Server::Simple;
  
@@ -43,9 +41,9 @@
 +my @classes = (qw(HTTP::Server::Simple SlowServer));
 +for my $class (@classes)
  {
--    my $s=HTTP::Server::Simple->new(PORT);
-+    my $s = $class->new(PORT);
-     is($s->port(),PORT,"Constructor set port correctly");
+-    my $s=HTTP::Server::Simple->new($PORT);
++    my $s = $class->new($PORT);
+     is($s->port(),$PORT,"Constructor set port correctly");
  
      my $pid=$s->background();
  
@@ -54,7 +52,7 @@
  
      my $content=fetch("GET / HTTP/1.1", "");
  
-@@ -34,7 +49,6 @@ my $DEBUG = 1 if @ARGV;
+@@ -35,7 +50,6 @@
      $s->host("localhost");
      my $pid=$s->background();
      diag("started server on $pid");
@@ -62,6 +60,3 @@
      like($pid, '/^-?\d+$/', 'pid is numeric');
  
      my $content=fetch("GET / HTTP/1.1", "");
--- 
-1.5.3.1
-

Modified: trunk/libhttp-server-simple-perl/debian/patches/0002-Signal-version-child-sends-SIGUSR1-to-the-parent-wh.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-server-simple-perl/debian/patches/0002-Signal-version-child-sends-SIGUSR1-to-the-parent-wh.patch?rev=17785&op=diff
==============================================================================
--- trunk/libhttp-server-simple-perl/debian/patches/0002-Signal-version-child-sends-SIGUSR1-to-the-parent-wh.patch (original)
+++ trunk/libhttp-server-simple-perl/debian/patches/0002-Signal-version-child-sends-SIGUSR1-to-the-parent-wh.patch Tue Mar 18 03:52:13 2008
@@ -7,11 +7,9 @@
  lib/HTTP/Server/Simple.pm |   51 ++++++++++++++++++++++++++++++++++++++++++--
  1 files changed, 48 insertions(+), 3 deletions(-)
 
-Index: libhttp-server-simple-perl/lib/HTTP/Server/Simple.pm
-===================================================================
 --- libhttp-server-simple-perl.orig/lib/HTTP/Server/Simple.pm
 +++ libhttp-server-simple-perl/lib/HTTP/Server/Simple.pm
-@@ -215,9 +215,30 @@ Run the server in the background. return
+@@ -215,9 +215,30 @@
  
  sub background {
      my $self  = shift;
@@ -20,7 +18,7 @@
 -    return $child if $child;
 +    my $parent_pid = $$;
 +
-+    # fork, then wait for the child to send us an 
++    # fork, then wait for the child to send us an
 +    # USR1 signal from _signal_parent()
 +
 +    { # scope for the local sighandler below
@@ -45,7 +43,7 @@
  
      if ( $^O !~ /MSWin32/ ) {
          require POSIX;
-@@ -263,6 +284,7 @@ sub run {
+@@ -263,6 +284,7 @@
  	$self->after_setup_listener();
          *{"$pkg\::run"} = $self->_default_run;
      }
@@ -53,7 +51,7 @@
  
      local $SIG{HUP} = sub { $SERVER_SHOULD_RUN = 0; };
  
-@@ -400,7 +422,30 @@ sub _process_request {
+@@ -400,7 +422,30 @@
          }
  }