Roll back Pub stream changes.

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 23 matching lines @@
   Future<http.StreamedResponse> send(http.BaseRequest request) {
     log.fine("Sending Curl request $request");
 
     var requestStream = request.finalize();
     return withTempDir((tempDir) {
       var headerFile = join(tempDir, "curl-headers");
       var arguments = _argumentsForRequest(request, headerFile);
       var process;
       return startProcess(executable, arguments).then((process_) {
         process = process_;
-        return Future.wait([
-          store(requestStream, process.stdin),
-          _waitForHeaders(process, expectBody: request.method != "HEAD")
-        ]);
+        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(
       http.BaseRequest request, String headerFile) {
@@ skipping 47 matching lines @@
   /// Returns a [Future] that completes once the `curl` [process] has finished
   /// receiving the response headers. [expectBody] indicates that the server is
   /// expected to send a response body (which is not the case for HEAD
   /// requests).
   ///
   /// Curl prints the headers to a file and then prints the body to stdout. So,
   /// in theory, we could read the headers as soon as we see anything appear
   /// in stdout. However, that seems to be too early to successfully read the
   /// file (at least on Mac). Instead, this just waits until the entire process
   /// has completed.
-  Future _waitForHeaders(PubProcess process, {bool expectBody}) {
-    var future = process.exitCode.then((exitCode) {
+  Future _waitForHeaders(Process process, {bool expectBody}) {
+    var completer = new Completer();
+    process.onExit = (exitCode) {
       log.io("Curl process exited with code $exitCode.");
-      if (exitCode == 0) return;
 
-      process.stderr.bytesToString().then((message) {
+      if (exitCode == 0) {
+        completer.complete(null);
+        return;
+      }
+
+      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);
         }
-      });
-    });
-
-    if (expectBody) return future;
+      }), completer);
+    };
 
     // If there's not going to be a response body (e.g. for HEAD requests), curl
     // prints the headers to stdout instead of the body. We want to wait until
     // all the headers are received to read them from the header file.
-    return Future.wait([process.stdout.toBytes(), future]);
+    if (!expectBody) {
+      return Future.wait([
+        consumeInputStream(process.stdout),
+        completer.future
+      ]);
+    }
+
+    return completer.future;
   }
 
   /// Returns a [http.StreamedResponse] from the response data printed by the
   /// `curl` [process]. [lines] are the headers that `curl` wrote to a file.
   http.StreamedResponse _buildResponse(
-      http.BaseRequest request, PubProcess process, List<String> lines) {
+      http.BaseRequest request, Process process, List<String> lines) {
     // When curl follows redirects, it prints the redirect headers as well as
     // the headers of the final request. Each block is separated by a blank
     // line. We just care about the last block. There is one trailing empty
     // line, though, which we don't want to consider a separator.
     var lastBlank = lines.lastIndexOf("", lines.length - 2);
     if (lastBlank != -1) lines.removeRange(0, lastBlank + 1);
 
     var statusParts = lines.removeAt(0).split(" ");
     var status = int.parse(statusParts[1]);
     var isRedirect = status >= 300 && status < 400;
     var reasonPhrase =
         Strings.join(statusParts.getRange(2, statusParts.length - 2), " ");
     var headers = {};
     for (var line in lines) {
       if (line.isEmpty) continue;
       var split = split1(line, ":");
       headers[split[0].toLowerCase()] = split[1].trim();
     }
+    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(
-        process.stdout, status, contentLength,
+        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);
   }
 }