Reapply "Add onClosed callbacks to HTTP output streams""

sdk/lib/io/http_impl.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.
 
 part of dart.io;
 
 // The close queue handles graceful closing of HTTP connections. When
 // a connection is added to the queue it will enter a wait state
 // waiting for all data written and possibly socket shutdown from
 // peer.
@@ skipping 482 matching lines @@
 
   void _streamClose() {
     _ensureHeadersSent();
     _state = _HttpRequestResponseBase.DONE;
     // Stop tracking no pending write events.
     _httpConnection._onNoPendingWrites = null;
     // Ensure that any trailing data is written.
     _writeDone();
     // Indicate to the connection that the response handling is done.
     _httpConnection._responseClosed();
+    if (_streamClosedHandler != null) {
+      new Timer(0, (_) => _streamClosedHandler());
+    }
   }
 
   void _streamSetNoPendingWriteHandler(callback()) {
     if (_state != _HttpRequestResponseBase.DONE) {
       _httpConnection._onNoPendingWrites = callback;
     }
   }
 
-  void _streamSetCloseHandler(callback()) {
-    // TODO(sgjesse): Handle this.
+  void _streamSetClosedHandler(callback()) {
+    _streamClosedHandler = callback;
   }
 
   void _streamSetErrorHandler(callback(e)) {
     _streamErrorHandler = callback;
   }
 
   String _findReasonPhrase(int statusCode) {
     if (_reasonPhrase != null) {
       return _reasonPhrase;
     }
@@ skipping 91 matching lines @@
     // Write headers.
     _headers._finalize(_protocolVersion);
     bool allWritten = _writeHeaders();
     _state = _HttpRequestResponseBase.HEADER_SENT;
     return allWritten;
   }
 
   int _statusCode;  // Response status code.
   String _reasonPhrase;  // Response reason phrase.
   _HttpOutputStream _outputStream;
+  Function _streamClosedHandler;
   Function _streamErrorHandler;
 }
 
 
 class _HttpInputStream extends _BaseDataInputStream implements InputStream {
   _HttpInputStream(_HttpRequestResponseBase this._requestOrResponse) {
     _checkScheduleCallbacks();
   }
 
   int available() {
@@ skipping 58 matching lines @@
 
   void destroy() {
     throw "Not implemented";
   }
 
   void set onNoPendingWrites(void callback()) {
     _requestOrResponse._streamSetNoPendingWriteHandler(callback);
   }
 
   void set onClosed(void callback()) {
-    _requestOrResponse._streamSetCloseHandler(callback);
+    _requestOrResponse._streamSetClosedHandler(callback);
   }
 
   void set onError(void callback(e)) {
     _requestOrResponse._streamSetErrorHandler(callback);
   }
 
   _HttpRequestResponseBase _requestOrResponse;
 }
 
 
@@ skipping 479 matching lines @@
   }
 
   void _streamClose() {
     _ensureHeadersSent();
     _state = _HttpRequestResponseBase.DONE;
     // Stop tracking no pending write events.
     _httpConnection._onNoPendingWrites = null;
     // Ensure that any trailing data is written.
     _writeDone();
     _connection._requestClosed();
+    if (_streamClosedHandler != null) {
+      new Timer(0, (_) => _streamClosedHandler());
+    }
   }
 
   void _streamSetNoPendingWriteHandler(callback()) {
     if (_state != _HttpRequestResponseBase.DONE) {
       _httpConnection._onNoPendingWrites = callback;
     }
   }
 
-  void _streamSetCloseHandler(callback()) {
-    // TODO(sgjesse): Handle this.
+  void _streamSetClosedHandler(callback()) {
+    _streamClosedHandler = callback;
   }
 
   void _streamSetErrorHandler(callback(e)) {
     _streamErrorHandler = callback;
   }
 
   void _writeHeader() {
     List<int> data;
 
     // Write request line.
@@ skipping 36 matching lines @@
     // Write headers.
     _headers._finalize("1.1");
     _writeHeaders();
     _state = _HttpRequestResponseBase.HEADER_SENT;
   }
 
   String _method;
   Uri _uri;
   _HttpClientConnection _connection;
   _HttpOutputStream _outputStream;
+  Function _streamClosedHandler;
   Function _streamErrorHandler;
   bool _emptyBody = true;
 }
 
 class _HttpClientResponse
     extends _HttpRequestResponseBase
     implements HttpClientResponse {
   _HttpClientResponse(_HttpClientConnection connection)
       : super(connection) {
     _connection = connection;
@@ skipping 1028 matching lines @@
 
 
 class _RedirectInfo implements RedirectInfo {
   const _RedirectInfo(int this.statusCode,
                       String this.method,
                       Uri this.location);
   final int statusCode;
   final String method;
   final Uri location;
 }