improved PSGI backend slightly

mojolicious · Oct 5, 2011 · 60cda9d · 60cda9d
1 parent c1a5c22
commit 60cda9d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 23 deletions.
diff --git a/lib/Mojo/Server/CGI.pm b/lib/Mojo/Server/CGI.pm
@@ -41,10 +41,7 @@ sub run {
       my $chunk = $res->get_start_line_chunk($offset);
 
       # No start line yet, try again
-      unless (defined $chunk) {
-        sleep 1;
-        next;
-      }
+      sleep 1 and next unless defined $chunk;
 
       # End of start line
       last unless length $chunk;
@@ -66,10 +63,7 @@ sub run {
     my $chunk = $res->get_header_chunk($offset);
 
     # No headers yet, try again
-    unless (defined $chunk) {
-      sleep 1;
-      next;
-    }
+    sleep 1 and next unless defined $chunk;
 
     # End of headers
     last unless length $chunk;
@@ -86,10 +80,7 @@ sub run {
     my $chunk = $res->get_body_chunk($offset);
 
     # No content yet, try again
-    unless (defined $chunk) {
-      sleep 1;
-      next;
-    }
+    sleep 1 and next unless defined $chunk;
 
     # End of content
     last unless length $chunk;

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