Revert "Fixes to eventhandler and HTTP"

sdk/lib/io/http_impl.dart

Index: sdk/lib/io/http_impl.dart
diff --git a/sdk/lib/io/http_impl.dart b/sdk/lib/io/http_impl.dart
index bdae934dbb196280cb8a61c751aaa3538a85c189..6a610a88d9bdf91d68ef0630c56d0b5e1cf25368 100644
--- a/sdk/lib/io/http_impl.dart
+++ b/sdk/lib/io/http_impl.dart
@@ -34,7 +34,7 @@ class _CloseQueue {
     connection._state |= _HttpConnectionBase.CLOSING;
     _q.add(connection);
 
-    // If the output stream is not closed for writing, close it now and
+    // If output stream is not closed for writing close it now and
     // wait for callback when closed.
     if (!connection._isWriteClosed) {
       connection._socket.outputStream.close();
@@ -940,7 +940,6 @@ class _HttpConnection extends _HttpConnectionBase {
       _request = null;
       _response = null;
       if (close) {
-        _httpParser.cancel();
         _server._closeQueue.add(this);
       } else {
         _state = _HttpConnectionBase.IDLE;
@@ -952,7 +951,7 @@ class _HttpConnection extends _HttpConnectionBase {
       // not care to read the request body) this is send.
       assert(!_isRequestDone);
       _writeBufferedResponse();
-      _httpParser.cancel();
+      _close();
       _server._closeQueue.add(this);
     }
   }