brought back ability to disable inactivity timeouts with test

mojolicious · Dec 22, 2011 · 9121e68 · 9121e68
1 parent d5e4d95
commit 9121e68
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,7 @@
 This file documents the revision history for Perl extension Mojolicious.
 
-2.40    2011-12-22 00:00:00
+2.40    2011-12-23 00:00:00
+        - Improved inactivity timeouts by allowing them to be disabled.
         - Fixed repository to not favor specific editors.
 
 2.39    2011-12-22 00:00:00

diff --git a/lib/Mojo/IOLoop/Stream.pm b/lib/Mojo/IOLoop/Stream.pm
@@ -62,8 +62,8 @@ sub resume {
   weaken $self;
   $self->{timer} ||= $watcher->recurring(
     '0.025' => sub {
-      $self->emit_safe('timeout')->close
-        if $self && (time - ($self->{active})) >= $self->timeout;
+      return unless $self && (my $t = $self->timeout);
+      $self->emit_safe('timeout')->close if (time - ($self->{active})) >= $t;
     }
   );
 
@@ -279,7 +279,8 @@ global L<Mojo::IOLoop> singleton.
   $stream     = $stream->timeout(45);
 
 Maximum amount of time in seconds stream can be inactive before getting
-closed automatically, defaults to C<15>. Note that this attribute is
+closed automatically, defaults to C<15>. Setting the value to C<0> will allow
+this stream to be inactive indefinitely. Note that this attribute is
 EXPERIMENTAL and might change without warning!
 
 =head1 METHODS

diff --git a/lib/Mojo/Server/Daemon.pm b/lib/Mojo/Server/Daemon.pm
@@ -393,7 +393,8 @@ Group for server process.
   $daemon     = $daemon->inactivity_timeout(5);
 
 Maximum amount of time in seconds a connection can be inactive before getting
-dropped, defaults to C<15>.
+dropped, defaults to C<15>. Setting the value to C<0> will allow connections
+to be inactive indefinitely.
 
 =head2 C<ioloop>
 
@@ -453,7 +454,8 @@ User for the server process.
   $server     = $server->websocket_timeout(300);
 
 Maximum amount of time in seconds a WebSocket connection can be inactive
-before getting dropped, defaults to C<300>.
+before getting dropped, defaults to C<300>. Setting the value to C<0> will
+allow WebSocket connections to be inactive indefinitely.
 
 =head1 METHODS
 

diff --git a/lib/Mojo/Server/Hypnotoad.pm b/lib/Mojo/Server/Hypnotoad.pm
@@ -564,7 +564,8 @@ to C<10>.
   inactivity_timeout => 10
 
 Maximum amount of time in seconds a connection can be inactive before being
-dropped, defaults to C<15>.
+dropped, defaults to C<15>. Setting the value to C<0> will allow connections
+to be inactive indefinitely.
 
 =head2 C<keep_alive_requests>
 
@@ -617,7 +618,8 @@ Username for worker processes.
   websocket_timeout => 150
 
 Maximum amount of time in seconds a WebSocket connection can be inactive
-before getting dropped, defaults to C<300>.
+before getting dropped, defaults to C<300>. Setting the value to C<0> will
+allow WebSocket connections to be inactive indefinitely.
 
 =head2 C<workers>
 

diff --git a/lib/Mojo/UserAgent.pm b/lib/Mojo/UserAgent.pm
@@ -714,7 +714,8 @@ Proxy server to use for HTTPS and WebSocket requests.
   $ua         = $ua->inactivity_timeout(15);
 
 Maximum amount of time in seconds a connection can be inactive before getting
-dropped, defaults to C<20>.
+dropped, defaults to C<20>. Setting the value to C<0> will allow connections
+to be inactive indefinitely.
 
 =head2 C<ioloop>
 
@@ -785,7 +786,8 @@ Note that this attribute is EXPERIMENTAL and might change without warning!
   $ua         = $ua->websocket_timeout(300);
 
 Maximum amount of time in seconds a WebSocket connection can be inactive
-before getting dropped, defaults to C<300>.
+before getting dropped, defaults to C<300>. Setting the value to C<0> will
+allow WebSocket connections to be inactive indefinitely.
 
 =head1 METHODS
 

diff --git a/t/mojo/ioloop.t b/t/mojo/ioloop.t
@@ -212,7 +212,7 @@ my ($client, $server, $client_after, $server_before, $server_after) = '';
 Mojo::IOLoop->server(
   {port => $port} => sub {
     my ($loop, $stream) = @_;
-    $stream->on(
+    $stream->timeout(0)->on(
       read => sub {
         my ($stream, $chunk) = @_;
         Mojo::IOLoop->timer(