Fix ALL the pub tests.

utils/pub/curl_client.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library curl_client;
 
 import 'dart:async';
 import 'dart:io';
 
 import '../../pkg/http/lib/http.dart' as http;
@@ skipping 24 matching lines @@
     log.fine("Sending Curl request $request");
 
     var requestStream = request.finalize();
     return withTempDir((tempDir) {
       var headerFile = join(tempDir, "curl-headers");
       var arguments = _argumentsForRequest(request, headerFile);
       log.process(executable, arguments);
       var process;
       return startProcess(executable, arguments).then((process_) {
         process = process_;
-        if (requestStream.closed) {
-          process.stdin.close();
-        } else {
-          requestStream.pipe(process.stdin);
-        }
-
+        return requestStream.pipe(wrapOutputStream(process.stdin));
+      }).then((_) {
         return _waitForHeaders(process, expectBody: request.method != "HEAD");
       }).then((_) => new File(headerFile).readAsLines())
         .then((lines) => _buildResponse(request, process, lines));
     });
   }
 
   /// Returns the list of arguments to `curl` necessary for performing
   /// [request]. [headerFile] is the path to the file where the response headers
   /// should be stored.
   List<String> _argumentsForRequest(
@@ skipping 58 matching lines @@
   Future _waitForHeaders(Process process, {bool expectBody}) {
     var completer = new Completer();
     process.onExit = (exitCode) {
       log.io("Curl process exited with code $exitCode.");
 
       if (exitCode == 0) {
         completer.complete(null);
         return;
       }
 
-      chainToCompleter(consumeInputStream(process.stderr)
-            .then((stderrBytes) {
+      chainToCompleter(consumeInputStream(process.stderr).then((stderrBytes) {
         var message = new String.fromCharCodes(stderrBytes);
         log.fine('Got error reading headers from curl: $message');
         if (exitCode == 47) {
           throw new RedirectLimitExceededException([]);
         } else {
           throw new HttpException(message);
         }
       }), completer);
     };
 
@@ skipping 35 matching lines @@
     var responseStream = process.stdout;
     if (responseStream.closed) {
       responseStream = new ListInputStream();
       responseStream.markEndOfStream();
     }
     var contentLength = -1;
     if (headers.containsKey('content-length')) {
       contentLength = int.parse(headers['content-length']);
     }
 
-    return new http.StreamedResponse(responseStream, status, contentLength,
+    return new http.StreamedResponse(
+        wrapInputStream(responseStream), status, contentLength,
         request: request,
         headers: headers,
         isRedirect: isRedirect,
         reasonPhrase: reasonPhrase);
   }
 
   /// The default executable to use for running curl. On Windows, this is the
   /// path to the bundled `curl.exe`; elsewhere, this is just "curl", and we
   /// assume it to be installed and on the user's PATH.
   static String get _defaultExecutable {
     if (Platform.operatingSystem != 'windows') return 'curl';
     // Note: This line of code gets munged by create_sdk.py to be the correct
     // relative path to curl in the SDK.
     var pathToCurl = "../../third_party/curl/curl.exe";
     return relativeToPub(pathToCurl);
   }
 }