Merge 6fd7dd2 into 458eb93

plack · Apr 11, 2014 · d2c98d5 · d2c98d5
2 parents 458eb93 + 6fd7dd2
commit d2c98d5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Changes b/Changes
@@ -13,6 +13,9 @@ Go to http://github.com/plack/Plack/issues for the roadmap and known issues.
           Plack::Middleware::Static was used for all paths except
           those matching /\.disallowed$/
 
+    [IMPROVEMENTS]
+        - Plack::App::WrapCGI no longer warns under 5.19.9 (frew)
+
 1.0030  2013-11-23 08:54:01 CET
     [IMPROVEMENTS]
         - Middleware::LogDispatch stringifies objects (oalders) #427

diff --git a/lib/Plack/App/WrapCGI.pm b/lib/Plack/App/WrapCGI.pm
@@ -63,9 +63,9 @@ sub prepare_app {
 
             my $res = '';
             while (waitpid($pid, WNOHANG) <= 0) {
-                $res .= do { local $/; <$stdoutr> };
+                $res .= do { local $/; <$stdoutr> } || '';
             }
-            $res .= do { local $/; <$stdoutr> };
+            $res .= do { local $/; <$stdoutr> } || '';
 
             if (POSIX::WIFEXITED($?)) {
                 return CGI::Parse::PSGI::parse_cgi_output(\$res);