Merge pull request #484 from frioux/patch-3

Correctly avoid warnings in Plack::App:::WrapCGI
plack · Dec 18, 2014 · 58be250 · 58be250
2 parents dc92f5c + bff8cb4
commit 58be250
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/lib/Plack/App/WrapCGI.pm b/lib/Plack/App/WrapCGI.pm
@@ -56,16 +56,28 @@ sub prepare_app {
             syswrite($stdinw, do {
                 local $/;
                 my $fh = $env->{'psgi.input'};
-                <$fh>;
+                my $v = <$fh>;
+                $v = '' unless defined $v;
+                $v
             });
             # close STDIN so child will stop waiting
             close $stdinw;
 
             my $res = '';
             while (waitpid($pid, WNOHANG) <= 0) {
-                $res .= do { local $/; <$stdoutr> } || '';
+                $res .= do {
+                    local $/;
+                    my $v = <$stdoutr>;
+                    $v = '' unless defined $v;
+                    $v
+                };
             }
-            $res .= do { local $/; <$stdoutr> } || '';
+            $res .= do {
+                local $/;
+                my $v = <$stdoutr>;
+                $v = '' unless defined $v;
+                $v
+            };
 
             if (POSIX::WIFEXITED($?)) {
                 return CGI::Parse::PSGI::parse_cgi_output(\$res);