improved event loop compatibility of Mojo::Server::PSGI

mojolicious · Mar 9, 2012 · 4c4a1f6 · 4c4a1f6
1 parent 5124f25
commit 4c4a1f6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/Changes b/Changes
@@ -3,6 +3,7 @@ This file documents the revision history for Perl extension Mojolicious.
 2.58    2012-03-09 00:00:00
         - Added support for MOJO_LISTEN environment variable.
         - Removed listen attribute from Mojo::Server::Morbo.
+        - Improved event loop compatibility of Mojo::Server::PSGI.
         - Improved documentation.
         - Improved tests.
         - Fixed Mojo::URL object handling bug in url_for.

diff --git a/lib/Mojo/Server/PSGI.pm b/lib/Mojo/Server/PSGI.pm
@@ -68,21 +68,16 @@ sub close { shift->{tx}->server_close }
 sub getline {
   my $self = shift;
 
-  # Blocking read
-  my $res = $self->{tx}->res;
-  while (1) {
-    my $chunk = $res->get_body_chunk($self->{offset} //= 0);
+  # No content yet, try again later
+  my $chunk = $self->{tx}->res->get_body_chunk($self->{offset} //= 0);
+  return '' unless defined $chunk;
 
-    # No content yet, try again
-    sleep 1 and next unless defined $chunk;
+  # End of content
+  return unless length $chunk;
 
-    # End of content
-    return unless length $chunk;
-
-    # Content
-    $self->{offset} += length $chunk;
-    return $chunk;
-  }
+  # Content
+  $self->{offset} += length $chunk;
+  return $chunk;
 }
 
 1;