Adapt streams for additional stackTrace argument.

pkg/http/test/safe_http_server.dart

 // Copyright (c) 2013, 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 safe_http_server;
 
 import 'dart:async';
 import 'dart:io';
 
 // TODO(nweiz): remove this when issue 9140 is fixed.
@@ skipping 23 matching lines @@
 
   int get port => _inner.port;
 
   set sessionTimeout(int timeout) {
     _inner.sessionTimeout = timeout;
   }
 
   HttpConnectionsInfo connectionsInfo() => _inner.connectionsInfo();
 
   StreamSubscription<HttpRequest> listen(void onData(HttpRequest value),
-      {void onError(error), void onDone(),
+      {Function onError, void onDone(),
       bool cancelOnError: false}) {
     var subscription;
     subscription = super.listen((request) {
       onData(new _HttpRequestWrapper(request));
-    }, onError: (error) {
+    }, onError: (error, [StackTrace stackTrace]) {

[Lasse Reichstein Nielsen, 2013/10/04 08:45:17]

Make not optional. This is our library class that we are calling listen on, it
should match.

[floitsch, 2013/10/05 18:11:48]

Done.

       // Ignore socket error 104, which is caused by a request being cancelled
       // before it writes any headers. There's no reason to care about such
       // requests.
       if (error is SocketException && error.osError.errorCode == 104) return;
       // Ignore any parsing errors, which come from malformed requests.
       if (error is HttpException) return;
       // Manually handle cancelOnError so the above (ignored) errors don't
       // cause unsubscription.
       if (cancelOnError) subscription.cancel();
-      if (onError != null) onError(error);
+      if (onError != null) {
+        if (onError is ZoneBinaryCallback) {

[Lasse Reichstein Nielsen, 2013/10/04 08:45:17]

Consider making a helper function: takesTwoArguments(onError)
Much more readable, and if we get a better way to do it, we only need to change
in one place.

[floitsch, 2013/10/05 18:11:48]

Will do it in the async library, but not outside it.

+          onError(error, stackTrace);
+        } else {
+          onError(error);
+        }
+      }
     }, onDone: onDone);
     return subscription;
   }
 }
 
 /// A wrapper around [HttpRequest] for the sole purpose of swallowing errors on
 /// [HttpResponse.done].
 class _HttpRequestWrapper extends StreamView<List<int>> implements HttpRequest {
   final HttpRequest _inner;
   final HttpResponse response;
@@ skipping 62 matching lines @@
   Future<HttpResponse> addStream(Stream<List<int>> stream) =>
     _inner.addStream(stream);
   Future close() => _inner.close();
   void write(Object obj) => _inner.write(obj);
   void writeAll(Iterable objects, [String separator = ""]) =>
     _inner.writeAll(objects, separator);
   void writeCharCode(int charCode) => _inner.writeCharCode(charCode);
   void writeln([Object obj = ""]) => _inner.writeln(obj);
   void addError(error) => _inner.addError(error);
 }