r19396 - in /branches/upstream/libhttp-server-simple-perl/current: ./ inc/Module/ inc/Module/Install/ lib/HTTP/Server/ lib/HTTP/Server/Simple/CGI/ t/
tincho-guest at users.alioth.debian.org
tincho-guest at users.alioth.debian.org
Sun May 4 21:47:40 UTC 2008
Author: tincho-guest
Date: Sun May 4 21:47:39 2008
New Revision: 19396
URL: http://svn.debian.org/wsvn/?sc=1&rev=19396
Log:
[svn-upgrade] Integrating new upstream version, libhttp-server-simple-perl (0.33)
Modified:
branches/upstream/libhttp-server-simple-perl/current/Changes
branches/upstream/libhttp-server-simple-perl/current/META.yml
branches/upstream/libhttp-server-simple-perl/current/SIGNATURE
branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install.pm
branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Base.pm
branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Can.pm
branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Fetch.pm
branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Makefile.pm
branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Metadata.pm
branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Win32.pm
branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/WriteAll.pm
branches/upstream/libhttp-server-simple-perl/current/lib/HTTP/Server/Simple.pm
branches/upstream/libhttp-server-simple-perl/current/lib/HTTP/Server/Simple/CGI/Environment.pm
branches/upstream/libhttp-server-simple-perl/current/t/01live.t
branches/upstream/libhttp-server-simple-perl/current/t/04cgi.t
Modified: branches/upstream/libhttp-server-simple-perl/current/Changes
URL: http://svn.debian.org/wsvn/branches/upstream/libhttp-server-simple-perl/current/Changes?rev=19396&op=diff
==============================================================================
--- branches/upstream/libhttp-server-simple-perl/current/Changes (original)
+++ branches/upstream/libhttp-server-simple-perl/current/Changes Sun May 4 21:47:39 2008
@@ -1,3 +1,13 @@
+0.33 Fri Apr 25 13:57:30 EDT 2008
+
+* The new support for background processes notifying the parent didn't quite work right for some apps using HSS. It's been reverted for now and the tests TODOED
+
+0.32 Thu Apr 24 09:45:14 EDT 2008
+
+* At least Apache and lighttpd put unencoded strings into PATH_INFO, so so should we.
+
+* Patch from ntyni at iki.fi to make backgrounding of the standalone server's server process deterministic. [rt.cpan.org #28122]
+
0.31 Sun Mar 16 20:51:04 EDT 2008
* Test suite parallelization fixes. Thanks to Slaven Rezic
Modified: branches/upstream/libhttp-server-simple-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libhttp-server-simple-perl/current/META.yml?rev=19396&op=diff
==============================================================================
--- branches/upstream/libhttp-server-simple-perl/current/META.yml (original)
+++ branches/upstream/libhttp-server-simple-perl/current/META.yml Sun May 4 21:47:39 2008
@@ -1,6 +1,7 @@
---
+author: ~
distribution_type: module
-generated_by: Module::Install version 0.67
+generated_by: Module::Install version 0.68
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.3.html
@@ -15,4 +16,4 @@
Socket: 0
Test::More: 0
URI::Escape: 0
-version: 0.28
+version: 0.31
Modified: branches/upstream/libhttp-server-simple-perl/current/SIGNATURE
URL: http://svn.debian.org/wsvn/branches/upstream/libhttp-server-simple-perl/current/SIGNATURE?rev=19396&op=diff
==============================================================================
--- branches/upstream/libhttp-server-simple-perl/current/SIGNATURE (original)
+++ branches/upstream/libhttp-server-simple-perl/current/SIGNATURE Sun May 4 21:47:39 2008
@@ -14,32 +14,32 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-SHA1 7b69e947da5e7df624dbf159f3732c91e3e279ef Changes
+SHA1 6e71ebcda56056cba0976936f663a31385ee74e9 Changes
SHA1 0ac508c50476dcc2bf8fe3094cb341425291e1ee MANIFEST
-SHA1 de5abaa8229fa5378d21eeb328081c8f14a7b488 META.yml
+SHA1 7812a1c898acbf76fcccb52068b2a9c23cb86bbf META.yml
SHA1 3a02ba613b11b07dd1fa97e2a6b962ee3e039c98 Makefile.PL
SHA1 ed0c107672daac3bc9e266876666e1059dbe44b7 README
SHA1 4ea1e9072ca87399184a46233df52a21e285604d ex/sample_server
-SHA1 78edb89a439463e44c33a72bbee84c54d0dc8aaf inc/Module/Install.pm
-SHA1 8ea4e37df83fd0c1c050be5c8da75545c3828d9b inc/Module/Install/Base.pm
-SHA1 1da6031583c32f0d1ec073b8376102fc51427dcc inc/Module/Install/Can.pm
-SHA1 b779375b90c16af2f31f38a1dd2b5df223c7f2fb inc/Module/Install/Fetch.pm
-SHA1 2054450e1e9c1dd8056362bf4a64ae70d5d71476 inc/Module/Install/Makefile.pm
-SHA1 5d6189b2cad15cf9932a28faafd55130c8247e83 inc/Module/Install/Metadata.pm
-SHA1 02af973fae2ac3531fa6b704574b2b8cb2a08148 inc/Module/Install/Win32.pm
-SHA1 3a2eab96e91cca8d99938cda7791759ae9d97b3a inc/Module/Install/WriteAll.pm
-SHA1 b961b499a6c7e02b278302020ae245e056bcfe0a lib/HTTP/Server/Simple.pm
+SHA1 7e2cfa1b9efe0d502ee57717649c90ba4bd28ba9 inc/Module/Install.pm
+SHA1 6e1392d80a0f239eecd5664f7f21f922cedb9329 inc/Module/Install/Base.pm
+SHA1 f69417fe831d9cc22a78f00a617afadceade4d81 inc/Module/Install/Can.pm
+SHA1 c61d02895330310048bf388881b5e2e064031561 inc/Module/Install/Fetch.pm
+SHA1 54fcbed19232ec959bb17cfb4410599afc7f0779 inc/Module/Install/Makefile.pm
+SHA1 7d3be9b158e37b2b2c22084740099955623b1d56 inc/Module/Install/Metadata.pm
+SHA1 0a8b66180229ba2f9deaea1fedd0aacf7a7ace6b inc/Module/Install/Win32.pm
+SHA1 d3352eb33fe43a5f3ead513f645224fe34d73bc9 inc/Module/Install/WriteAll.pm
+SHA1 a2d9fa209ed532a7d2f54d39e61b9db22ec2d8a2 lib/HTTP/Server/Simple.pm
SHA1 40f24374f2b5845a3025e14ca4b91bd58298de03 lib/HTTP/Server/Simple/CGI.pm
-SHA1 47ef836a1cdd03add505dd4c90819cafb61dc565 lib/HTTP/Server/Simple/CGI/Environment.pm
+SHA1 99ec6998826486bbc5775b222408e6baf40dc885 lib/HTTP/Server/Simple/CGI/Environment.pm
SHA1 db064af54cab345a71daec576e32e64b8fb1033d t/00smoke.t
-SHA1 392ce46ec841bbee3072898413602517efa69ab0 t/01live.t
+SHA1 c58cc41a260213d9aeb4bed7b6c2926a37a3402a t/01live.t
SHA1 aca95653cfce68912e08c57b3a4566207e2f99b3 t/02pod.t
SHA1 a7024d0d8e7b80d26f75a3551a1406a797b382f8 t/03podcoverage.t
-SHA1 354a5265b406fa5c183446cfb2bc98738815dbda t/04cgi.t
+SHA1 e19b6afffd4ced1f89832080822686f49a155688 t/04cgi.t
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.8 (Darwin)
-iD8DBQFH3cC8Ei9d9xCOQEYRAlo2AKDEVlxDpNjlWAsMyhrQEsi1mHshFACdHQmY
-NnNSbPL4jIEphEVZ5S38yew=
-=S+LQ
+iD8DBQFIEhwGEi9d9xCOQEYRAhvXAJoDmvqGE9jgLW3rBnmFN2HlE+l0MQCgykQf
+dpmWP9A3gs4Glr2o8mIYDAI=
+=86Kr
-----END PGP SIGNATURE-----
Modified: branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install.pm?rev=19396&op=diff
==============================================================================
--- branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install.pm (original)
+++ branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install.pm Sun May 4 21:47:39 2008
@@ -28,7 +28,7 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '0.67';
+ $VERSION = '0.68';
}
# Whether or not inc::Module::Install is actually loaded, the
Modified: branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Base.pm?rev=19396&op=diff
==============================================================================
--- branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Base.pm (original)
+++ branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Base.pm Sun May 4 21:47:39 2008
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.67';
+$VERSION = '0.68';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Can.pm?rev=19396&op=diff
==============================================================================
--- branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Can.pm (original)
+++ branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Can.pm Sun May 4 21:47:39 2008
@@ -11,7 +11,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.67';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Fetch.pm?rev=19396&op=diff
==============================================================================
--- branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Fetch.pm (original)
+++ branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Fetch.pm Sun May 4 21:47:39 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.67';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Makefile.pm?rev=19396&op=diff
==============================================================================
--- branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Makefile.pm (original)
+++ branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Makefile.pm Sun May 4 21:47:39 2008
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.67';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Metadata.pm?rev=19396&op=diff
==============================================================================
--- branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Metadata.pm (original)
+++ branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Metadata.pm Sun May 4 21:47:39 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.67';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Win32.pm?rev=19396&op=diff
==============================================================================
--- branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Win32.pm (original)
+++ branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/Win32.pm Sun May 4 21:47:39 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.67';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/WriteAll.pm?rev=19396&op=diff
==============================================================================
--- branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/WriteAll.pm (original)
+++ branches/upstream/libhttp-server-simple-perl/current/inc/Module/Install/WriteAll.pm Sun May 4 21:47:39 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.67';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libhttp-server-simple-perl/current/lib/HTTP/Server/Simple.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libhttp-server-simple-perl/current/lib/HTTP/Server/Simple.pm?rev=19396&op=diff
==============================================================================
--- branches/upstream/libhttp-server-simple-perl/current/lib/HTTP/Server/Simple.pm (original)
+++ branches/upstream/libhttp-server-simple-perl/current/lib/HTTP/Server/Simple.pm Sun May 4 21:47:39 2008
@@ -8,7 +8,7 @@
use URI::Escape;
use vars qw($VERSION $bad_request_doc);
-$VERSION = '0.31';
+$VERSION = '0.33';
=head1 NAME
Modified: branches/upstream/libhttp-server-simple-perl/current/lib/HTTP/Server/Simple/CGI/Environment.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libhttp-server-simple-perl/current/lib/HTTP/Server/Simple/CGI/Environment.pm?rev=19396&op=diff
==============================================================================
--- branches/upstream/libhttp-server-simple-perl/current/lib/HTTP/Server/Simple/CGI/Environment.pm (original)
+++ branches/upstream/libhttp-server-simple-perl/current/lib/HTTP/Server/Simple/CGI/Environment.pm Sun May 4 21:47:39 2008
@@ -82,6 +82,9 @@
}
}
+ # Apache and lighttpd both do one layer of unescaping on
+ # path_info; we should duplicate that.
+ $ENV{PATH_INFO} = URI::Escape::uri_unescape($ENV{PATH_INFO});
}
=head2 header
Modified: branches/upstream/libhttp-server-simple-perl/current/t/01live.t
URL: http://svn.debian.org/wsvn/branches/upstream/libhttp-server-simple-perl/current/t/01live.t?rev=19396&op=diff
==============================================================================
--- branches/upstream/libhttp-server-simple-perl/current/t/01live.t (original)
+++ branches/upstream/libhttp-server-simple-perl/current/t/01live.t Sun May 4 21:47:39 2008
@@ -1,7 +1,7 @@
# -*- perl -*-
use Socket;
-use Test::More tests => 10;
+use Test::More tests => 14;
use strict;
# This script assumes that `localhost' will resolve to a local IP
@@ -12,37 +12,48 @@
use HTTP::Server::Simple;
+package SlowServer;
+# This test class just waits a while before it starts
+# accepting connections. This makes sure that CPAN #28122 is fixed:
+# background() shouldn't return prematurely.
+
+use base qw(HTTP::Server::Simple::CGI);
+sub setup_listener {
+ my $self = shift;
+ sleep 2;
+ $self->SUPER::setup_listener();
+}
+1;
+package main;
+
my $DEBUG = 1 if @ARGV;
-{
- my $s=HTTP::Server::Simple->new($PORT);
- is($s->port(),$PORT,"Constructor set port correctly");
+my @classes = (qw(HTTP::Server::Simple));
+for my $class (@classes) {
+ run_server_tests($class);
+}
- my $pid=$s->background();
- like($pid, '/^-?\d+$/', 'pid is numeric');
- select(undef,undef,undef,0.2); # wait a sec
+TODO: {
+ local $TODO = "We don't currently wait for 'server is running' responses from the client";
+ run_server_tests('SlowServer');
- my $content=fetch("GET / HTTP/1.1", "");
+}
- like($content, '/Congratulations/', "Returns a page");
- is(kill(9,$pid),1,'Signaled 1 process successfully');
- wait or die "couldn't wait for sub-process completion";
-}
+
{
my $s=HTTP::Server::Simple::CGI->new($PORT);
$s->host("localhost");
my $pid=$s->background();
diag("started server on $pid");
+ like($pid, '/^-?\d+$/', 'pid is numeric');
select(undef,undef,undef,0.2); # wait a sec
- like($pid, '/^-?\d+$/', 'pid is numeric');
-
my $content=fetch("GET / HTTP/1.1", "");
like($content, '/Congratulations/', "Returns a page");
eval {
- like(fetch("GET your mum wet"), # anything does!
+ like(fetch("GET a bogus request"),
'/bad request/i',
"knows what a request isn't");
};
@@ -127,3 +138,19 @@
}
+sub run_server_tests {
+ my $class = shift;
+ my $s = $class->new($PORT);
+ is($s->port(),$PORT,"Constructor set port correctly");
+
+ my $pid=$s->background();
+ select(undef,undef,undef,0.2); # wait a sec
+
+ like($pid, '/^-?\d+$/', 'pid is numeric');
+
+ my $content=fetch("GET / HTTP/1.1", "");
+
+ like($content, '/Congratulations/', "Returns a page");
+ is(kill(9,$pid),1,'Signaled 1 process successfully');
+ wait or die "couldn't wait for sub-process completion";
+}
Modified: branches/upstream/libhttp-server-simple-perl/current/t/04cgi.t
URL: http://svn.debian.org/wsvn/branches/upstream/libhttp-server-simple-perl/current/t/04cgi.t?rev=19396&op=diff
==============================================================================
--- branches/upstream/libhttp-server-simple-perl/current/t/04cgi.t (original)
+++ branches/upstream/libhttp-server-simple-perl/current/t/04cgi.t Sun May 4 21:47:39 2008
@@ -2,7 +2,7 @@
use Socket;
use strict;
-plan tests => 21;
+plan tests => 22;
my $PORT = 8000 + $$;
my $host = gethostbyaddr(inet_aton('localhost'), AF_INET);
@@ -61,9 +61,16 @@
like(
fetch("GET /cgitest/REQUEST_URI?foo%3Fbar",""),
- "/foo%3Fbar/",
+ qr/foo%3Fbar/,
"Didn't decode already"
);
+
+ like(
+ fetch("GET /cgitest/foo%2Fbar/PATH_INFO",""),
+ qr|foo/bar|,
+ "Did decode already"
+ );
+
is(kill(9,$pid),1,'Signaled 1 process successfully');
wait or die "counldn't wait for sub-process completion";
More information about the Pkg-perl-cvs-commits
mailing list