diff --git a/test/http_content_length_test.dart b/test/http_content_length_test.dart
new file mode 100644
index 0000000..80d81f7
--- /dev/null
+++ b/test/http_content_length_test.dart
@@ -0,0 +1,253 @@
+// 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.
+
+import "dart:async";
+
+import "package:http_io/http_io.dart";
+import "package:test/test.dart";
+
+Future<Null> testNoBody(int totalConnections, bool explicitContentLength) {
+  var completer = new Completer<Null>();
+  int count = 0;
+  HttpServer.bind("127.0.0.1", 0, backlog: totalConnections).then((server) {
+    server.listen((HttpRequest request) {
+      expect("0", equals(request.headers.value('content-length')));
+      expect(0, equals(request.contentLength));
+      var response = request.response;
+      response.contentLength = 0;
+      response.done.then((_) {
+        fail("Unexpected successful response completion");
+      }).catchError((error) {
+        expect(error is HttpException, isTrue);
+        if (++count == totalConnections) {
+          server.close();
+          completer.complete(null);
+        }
+      });
+      // write with content length 0 closes the connection and
+      // reports an error.
+      response.write("x");
+      // Subsequent write are ignored as there is already an
+      // error.
+      response.write("x");
+      // After an explicit close, write becomes a state error
+      // because we have said we will not add more.
+      response.close();
+      response.write("x");
+    }, onError: (e, trace) {
+      String msg = "Unexpected server error $e";
+      if (trace != null) msg += "\nStackTrace: $trace";
+      fail(msg);
+    });
+
+    HttpClient client = new HttpClient();
+    for (int i = 0; i < totalConnections; i++) {
+      client.get("127.0.0.1", server.port, "/").then((request) {
+        if (explicitContentLength) {
+          request.contentLength = 0;
+        }
+        return request.close();
+      }).then((response) {
+        expect("0", equals(response.headers.value('content-length')));
+        expect(0, equals(response.contentLength));
+        response.drain();
+      }).catchError((e, trace) {
+        // It's also okay to fail, as headers may not be written.
+      });
+    }
+  });
+  return completer.future;
+}
+
+Future<Null> testBody(int totalConnections, bool useHeader) {
+  var completer = new Completer<Null>();
+  HttpServer.bind("127.0.0.1", 0, backlog: totalConnections).then((server) {
+    int serverCount = 0;
+    server.listen((HttpRequest request) {
+      expect("2", equals(request.headers.value('content-length')));
+      expect(2, equals(request.contentLength));
+      var response = request.response;
+      if (useHeader) {
+        response.contentLength = 2;
+      } else {
+        response.headers.set("content-length", 2);
+      }
+      request.listen((d) {}, onDone: () {
+        response.write("x");
+        try {
+          response.contentLength = 3;
+          fail("Expected HttpException");
+        } catch (e) {
+          expect(e is HttpException, isTrue);
+        }
+        response.write("x");
+        response.write("x");
+        response.done.then((_) {
+          fail("Unexpected successful response completion");
+        }).catchError((error) {
+          expect(error is HttpException, isTrue);
+          if (++serverCount == totalConnections) {
+            server.close();
+            completer.complete(null);
+          }
+        });
+        response.close();
+        response.write("x");
+      });
+    }, onError: (e, trace) {
+      String msg = "Unexpected error $e";
+      if (trace != null) msg += "\nStackTrace: $trace";
+      fail(msg);
+    });
+
+    int clientCount = 0;
+    HttpClient client = new HttpClient();
+    for (int i = 0; i < totalConnections; i++) {
+      client.get("127.0.0.1", server.port, "/").then((request) {
+        if (useHeader) {
+          request.contentLength = 2;
+        } else {
+          request.headers.add(HttpHeaders.CONTENT_LENGTH, "7");
+          request.headers.add(HttpHeaders.CONTENT_LENGTH, "2");
+        }
+        request.write("x");
+        try {
+          request.contentLength = 3;
+          fail("Expected HttpException");
+        } catch (e) {
+          expect(e is HttpException, isTrue);
+        }
+        request.write("x");
+        return request.close();
+      }).then((response) {
+        expect("2", equals(response.headers.value('content-length')));
+        expect(2, equals(response.contentLength));
+        response.listen((d) {}, onDone: () {
+          if (++clientCount == totalConnections) {
+            client.close();
+          }
+        }, onError: (error, trace) {
+          // Undefined what server response sends.
+        });
+      }).catchError((error) {
+        // It's also okay to fail, as headers may not be written.
+      });
+    }
+  });
+  return completer.future;
+}
+
+Future<Null> testBodyChunked(int totalConnections, bool useHeader) {
+  var completer = new Completer<Null>();
+  HttpServer.bind("127.0.0.1", 0, backlog: totalConnections).then((server) {
+    server.listen((HttpRequest request) {
+      expect(request.headers.value('content-length'), isNull);
+      expect(-1, equals(request.contentLength));
+      var response = request.response;
+      if (useHeader) {
+        response.contentLength = 2;
+        response.headers.chunkedTransferEncoding = true;
+      } else {
+        response.headers.set("content-length", 2);
+        response.headers.set("transfer-encoding", "chunked");
+      }
+      request.listen((d) {}, onDone: () {
+        response.write("x");
+        try {
+          response.headers.chunkedTransferEncoding = false;
+          fail("Expected HttpException");
+        } catch (e) {
+          expect(e is HttpException, isTrue);
+        }
+        response.write("x");
+        response.write("x");
+        response.close();
+        response.write("x");
+      });
+    }, onError: (e, trace) {
+      String msg = "Unexpected error $e";
+      if (trace != null) msg += "\nStackTrace: $trace";
+      fail(msg);
+    });
+
+    int count = 0;
+    HttpClient client = new HttpClient();
+    for (int i = 0; i < totalConnections; i++) {
+      client.get("127.0.0.1", server.port, "/").then((request) {
+        if (useHeader) {
+          request.contentLength = 2;
+          request.headers.chunkedTransferEncoding = true;
+        } else {
+          request.headers.add(HttpHeaders.CONTENT_LENGTH, "2");
+          request.headers.set(HttpHeaders.TRANSFER_ENCODING, "chunked");
+        }
+        request.write("x");
+        try {
+          request.headers.chunkedTransferEncoding = false;
+          fail("Expected HttpException");
+        } catch (e) {
+          expect(e is HttpException, isTrue);
+        }
+        request.write("x");
+        request.write("x");
+        return request.close();
+      }).then((response) {
+        expect(response.headers.value('content-length'), isNull);
+        expect(-1, equals(response.contentLength));
+        response.listen((d) {}, onDone: () {
+          if (++count == totalConnections) {
+            client.close();
+            server.close();
+            completer.complete(null);
+          }
+        });
+      }).catchError((e, trace) {
+        String msg = "Unexpected error $e";
+        if (trace != null) msg += "\nStackTrace: $trace";
+        fail(msg);
+      });
+    }
+  });
+  return completer.future;
+}
+
+Future<Null> testSetContentLength() {
+  var completer = new Completer<Null>();
+  HttpServer.bind("127.0.0.1", 0).then((server) {
+    server.listen((HttpRequest request) {
+      var response = request.response;
+      expect(response.headers.value('content-length'), isNull);
+      expect(-1, equals(response.contentLength));
+      response.headers.set("content-length", 3);
+      expect("3", equals(response.headers.value('content-length')));
+      expect(3, equals(response.contentLength));
+      response.write("xxx");
+      response.close();
+    });
+
+    var client = new HttpClient();
+    client
+        .get("127.0.0.1", server.port, "/")
+        .then((request) => request.close())
+        .then((response) {
+      response.listen((_) {}, onDone: () {
+        client.close();
+        server.close();
+        completer.complete(null);
+      });
+    });
+  });
+  return completer.future;
+}
+
+void main() {
+  test('NoBody5', () => testNoBody(5, false));
+  test('NoBody25', () => testNoBody(25, false));
+  test('NoBody5Explicit', () => testNoBody(5, true));
+  test('NoBody25Explicit', () => testNoBody(25, true));
+  test('Body5', () => testBody(5, false));
+  test('BodyChunked5', () => testBodyChunked(5, false));
+  test('BodyChunked5UseHeader', () => testBodyChunked(5, true));
+  test('SetContentLength', () => testSetContentLength());
+}