Get curl uploads working on Mac.

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:io';
 
 import '../../pkg/http/lib/http.dart' as http;
 import 'io.dart';
@@ skipping 87 matching lines @@
     });
     arguments.add(request.url.toString());
 
     return arguments;
   }
 
   /// 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).
   Future _waitForHeaders(Process process, {bool expectBody}) {

[nweiz, 2012/11/30 01:19:45]

If you're still going to call this "waitForHeaders", at least explain in the
documentation that it's necessary to wait for the process to terminate as well.

[Bob Nystrom, 2012/11/30 01:42:45]

Added a comment explaining.

-    var exitCompleter = new Completer<int>();
-    var exitFuture = exitCompleter.future;
+    var completer = new Completer();
     process.onExit = (exitCode) {
       if (exitCode == 0) {
-        exitCompleter.complete(0);
+        completer.complete(null);
         return;
       }
 
       chainToCompleter(consumeInputStream(process.stderr)
             .transform((stderrBytes) {
         var message = new String.fromCharCodes(stderrBytes);
         if (exitCode == 47) {
           throw new RedirectLimitExceededException([]);
         } else {
           throw new HttpException(message);
         }
-      }), exitCompleter);
+      }), 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.
     if (!expectBody) {
       return Futures.wait([
         consumeInputStream(process.stdout),
-        exitFuture
+        completer.future
       ]);
     }
 
-    // TODO(nweiz): remove this when issue 4061 is fixed.
-    var stackTrace;
-    try {
-      throw "";
-    } catch (_, localStackTrace) {
-      stackTrace = localStackTrace;
-    }
-
-    var completer = new Completer();
-    resetCallbacks() {
-      process.stdout.onData = null;
-      process.stdout.onError = null;
-      process.stdout.onClosed = null;
-    }
-    process.stdout.onData = () {
-      // TODO(nweiz): If an error happens after the body data starts being
-      // received, it should be piped through Response.stream once issue
-      // 3657 is fixed.
-      exitFuture.handleException((e) => true);
-      resetCallbacks();
-      completer.complete(null);
-    };
-    process.stdout.onError = (e) {
-      resetCallbacks();
-      completer.completeException(e, stackTrace);
-    };
-    process.stdout.onClosed = () {
-      resetCallbacks();
-      chainToCompleter(exitFuture, completer);
-    };
     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, 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
@@ skipping 33 matching lines @@
   /// 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);
   }
 }