fixed Windows bugs in tests (closes #447)

mojolicious · Jan 18, 2013 · a2429ad · a2429ad
1 parent d1d2c91
commit a2429ad
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Changes b/Changes
@@ -1,4 +1,7 @@
 
+3.82  2013-01-18
+  - Fixed Windows bugs in tests. (kmx, sri)
+
 3.81  2013-01-17
   - Added modules Mojo::Server::Prefork and Mojolicious::Command::prefork.
   - Added lookup method to Mojolicious::Routes.

diff --git a/lib/Mojo/Server/Prefork.pm b/lib/Mojo/Server/Prefork.pm
@@ -7,7 +7,7 @@ use IO::Poll 'POLLIN';
 use List::Util 'shuffle';
 use POSIX 'WNOHANG';
 use Scalar::Util 'weaken';
-use Time::HiRes 'ualarm';
+use Time::HiRes ();
 
 has accepts         => 1000;
 has accept_interval => 0.025;
@@ -185,9 +185,9 @@ sub _spawn {
       if ($_[1]) {
         eval {
           local $SIG{ALRM} = sub { die "alarm\n" };
-          my $old = ualarm $self->lock_timeout * 1000000;
+          my $old = Time::HiRes::ualarm $self->lock_timeout * 1000000;
           $l = flock $handle, LOCK_EX;
-          ualarm $old;
+          Time::HiRes::ualarm $old;
         };
         if ($@) { $l = $@ eq "alarm\n" ? 0 : die($@) }
       }

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -40,7 +40,7 @@ has static   => sub { Mojolicious::Static->new };
 has types    => sub { Mojolicious::Types->new };
 
 our $CODENAME = 'Rainbow';
-our $VERSION  = '3.81';
+our $VERSION  = '3.82';
 
 sub AUTOLOAD {
   my $self = shift;