[Bps-public-commit] UNNAMED PROJECT branch, master, updated. c743826ecd6263a148aecdb09252478989b9e118

[jesse]

The branch, master has been updated
       via  c743826ecd6263a148aecdb09252478989b9e118 (commit)
       via  41d5ad758c35bcc4ee085115e8f0892e6521ed48 (commit)
       via  55823fde3b8f91b1e9fbd7d0746acb931bd35042 (commit)
      from  d25e1f8cf010ff7f5dacc093313b104234458b4d (commit)

Summary of changes:
 Changes                   |    7 ++++++-
 lib/HTTP/Server/Simple.pm |    2 +-
 t/01live.t                |    4 ++--
 t/04cgi.t                 |    8 ++++----
 4 files changed, 13 insertions(+), 8 deletions(-)

- Log -----------------------------------------------------------------
commit 55823fde3b8f91b1e9fbd7d0746acb931bd35042
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Jul 28 15:17:12 2009 -0400

    Patch from kmx at rt.cpan.org to better randomize ports on Windows

diff --git a/t/01live.t b/t/01live.t
index 4f4ed77..3c4789f 100644
--- a/t/01live.t
+++ b/t/01live.t
@@ -7,7 +7,7 @@ use strict;
 # This script assumes that `localhost' will resolve to a local IP
 # address that may be bound to,
 
-my $PORT = 8000 + $$;
+my $PORT = 40000 + int(rand(10000));
 
 
 use HTTP::Server::Simple;
@@ -40,7 +40,7 @@ for my $class (@classes) {
     my $s=HTTP::Server::Simple::CGI->new($PORT);
     $s->host("localhost");
     my $pid=$s->background();
-    diag("started server on $pid");
+    diag("started server PID=$pid");
     like($pid, '/^-?\d+$/', 'pid is numeric');
     select(undef,undef,undef,0.2); # wait a sec
     my $content=fetch("GET / HTTP/1.1", "");
diff --git a/t/04cgi.t b/t/04cgi.t
index ba25796..5b81986 100644
--- a/t/04cgi.t
+++ b/t/04cgi.t
@@ -3,7 +3,7 @@ use Socket;
 use strict;
 
 plan tests => 22;
-my $PORT = 8000 + $$;
+my $PORT = 40000 + int(rand(10000));
 
 my $host = gethostbyaddr(inet_aton('localhost'), AF_INET);
 

commit 41d5ad758c35bcc4ee085115e8f0892e6521ed48
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Jul 28 15:26:13 2009 -0400

    another patch from kmx to try to fix our windows test issue.

diff --git a/Changes b/Changes
index 521bb0a..d8ba6f8 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,11 @@
+0.38_03 Tue Jul 28 15:26:05 EDT 2009
+
+* Patch from kmx at cpan.org to better randomize ports on Windows
+* Patch from kmx at cpan.org to try another fix for our 4cgi.t failures on windows
+
 0.38_02 Fri Apr 10 20:57:19 EDT 2009
 
-* Specify an HTTP version for our GETs should get escaping to wokr
+* Specify an HTTP version for our GETs should get escaping to work
 
 0.38_01 Mon Mar  2 18:11:46 EST 2009
 * http://rt.cpan.org/Ticket/Attachment/568795/286902/ from confound++ for 
diff --git a/t/04cgi.t b/t/04cgi.t
index 5b81986..09f66c1 100644
--- a/t/04cgi.t
+++ b/t/04cgi.t
@@ -21,7 +21,7 @@ my %envvars=(
               SERVER_PORT => 'SERVER_PORT: '.$PORT,
               REQUEST_METHOD => 'REQUEST_METHOD: GET',
               REQUEST_URI => 'REQUEST_URI: /cgitest/REQUEST_URI',
-              SERVER_PROTOCOL => 'SERVER_PROTOCOL: HTTP/1.1',
+              SERVER_PROTOCOL => 'SERVER_PROTOCOL: HTTP/0.9',
               SERVER_NAME => "SERVER_NAME: $host",
               SERVER_SOFTWARE => 'SERVER_SOFTWARE: HTTP::Server::Simple/\d+.\d+',
               REMOTE_ADDR => 'REMOTE_ADDR: 127.0.0.1',
@@ -43,7 +43,7 @@ my %envvars=(
 
   foreach my $method (keys(%methods)) {
     like(
-          fetch("GET /cgitest/$method HTTP/1.1",""),
+          fetch("GET /cgitest/$method"),
           "/$methods{$method}/",
           "method - $method"
         );
@@ -52,7 +52,7 @@ my %envvars=(
 
   foreach my $envvar (keys(%envvars)) {
     like(
-          fetch("GET /cgitest/$envvar HTTP/1.1",""),
+          fetch("GET /cgitest/$envvar"),
           "/$envvars{$envvar}/",
           "Environment - $envvar"
         );

commit c743826ecd6263a148aecdb09252478989b9e118
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Jul 28 15:26:35 2009 -0400

    bumping version for release of 0.38_03

diff --git a/lib/HTTP/Server/Simple.pm b/lib/HTTP/Server/Simple.pm
index ad594c1..9b358cc 100755
--- a/lib/HTTP/Server/Simple.pm
+++ b/lib/HTTP/Server/Simple.pm
@@ -8,7 +8,7 @@ use Carp;
 use URI::Escape;
 
 use vars qw($VERSION $bad_request_doc);
-$VERSION = '0.38_02';
+$VERSION = '0.38_03';
 
 =head1 NAME
 

-----------------------------------------------------------------------