Change the handling og the HTTP content length

runtime/bin/http_impl.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.
 
 class _HttpHeaders implements HttpHeaders {
   _HttpHeaders() : _headers = new Map<String, List<String>>();
 
   List<String> operator[](String name) {
     name = name.toLowerCase();
     return _headers[name];
@@ skipping 672 matching lines @@
     bool allWritten = true;
     if (_contentLength < 0) {
       // Terminate the content if transfer encoding is chunked.
       allWritten = _httpConnection._write(_Const.END_CHUNKED);
     } else {
       if (!_headResponse && _bodyBytesWritten < _contentLength) {
         throw new HttpException("Sending less than specified content length");
       }
       assert(_headResponse || _bodyBytesWritten == _contentLength);
     }
-    // If we are done writing the response and the client has closed
-    // or the connection is not persistent we can close.
-    if (!persistentConnection || _httpConnection._closing) {
+    // If we are done writing the response, and either the client has
+    // closed or the connection is not persistent, we can close. Also
+    // if using HTTP 1.0 and the content length was not known we must
+    // close to indicate end of body.
+    if (!persistentConnection || _httpConnection._closing ||
+        (_protocolVersion == "1.0" && _contentLength < 0)) {
       _httpConnection._close();
     }
     return allWritten;
   }
 
   bool _writeHeaders() {
     _headers._mutable = false;
     _headers._write(_httpConnection);
     // Terminate header.
     return _writeCRLF();
@@ skipping 177 matching lines @@
       });
       if (sessionId != null) {
         var sessionManager = _httpConnection._server._sessionManager;
         _session = sessionManager.getSession(sessionId);
         if (_session != null) {
           _session._markSeen();
         }
       }
     }
 
+    // Get parsed content length.
+    _contentLength = _httpConnection._httpParser.contentLength;
+
+    // Prepare for receiving data.
     _headers._mutable = false;
-    // Prepare for receiving data.
     _buffer = new _BufferList();
   }
 
   void _onDataReceived(List<int> data) {
     _buffer.add(data);
     if (_inputStream != null) _inputStream._dataReceived();
   }
 
   void _onDataEnd() {
     if (_inputStream != null) _inputStream._closeReceived();
@@ skipping 186 matching lines @@
       case HttpStatus.GATEWAY_TIMEOUT: return "Gateway Time-out";
       case HttpStatus.HTTP_VERSION_NOT_SUPPORTED:
         return "Http Version not supported";
       default: return "Status $statusCode";
     }
   }
 
   bool _writeHeader() {
     List<int> data;
 
-    // HTTP/1.0 does not support chunked.
-    if (_protocolVersion == "1.0" && _contentLength < 0) {
-      throw new HttpException("Content length required for HTTP 1.0");
-    }
-
     // Write status line.
     if (_protocolVersion == "1.1") {
       _httpConnection._write(_Const.HTTP11);
     } else {
       _httpConnection._write(_Const.HTTP10);
     }
     _writeSP();
     data = _statusCode.toString().charCodes;
     _httpConnection._write(data);
     _writeSP();
     data = reasonPhrase.charCodes;
     _httpConnection._write(data);
     _writeCRLF();
 
     // Determine the value of the "Transfer-Encoding" header based on
-    // whether the content length is known.
+    // whether the content length is known. HTTP/1.0 does not support
+    // chunked.
     if (_contentLength >= 0) {
       _headers.set(HttpHeaders.CONTENT_LENGTH, _contentLength.toString());
-    } else if (_contentLength < 0) {
+    } else if (_contentLength < 0 && _protocolVersion == "1.1") {
       _headers.set(HttpHeaders.TRANSFER_ENCODING, "chunked");
     }
 
     var session = _httpConnection._request._session;
     if (session != null && !session._destroyed) {
       // Make sure we only send the current session id.
       bool found = false;
       for (int i = 0; i < cookies.length; i++) {
         if (cookies[i].name.toUpperCase() == _DART_SESSION_ID) {
           cookie.value = session.id;
@@ skipping 553 matching lines @@
     } else {
       data = _uri.toString().charCodes;
     }
     _httpConnection._write(data);
     _writeSP();
     _httpConnection._write(_Const.HTTP11);
     _writeCRLF();
 
     // Determine the value of the "Transfer-Encoding" header based on
     // whether the content length is known. If there is no content
-    // neither "Content-Length" nor "Transfer-Encoding" is set
+    // neither "Content-Length" nor "Transfer-Encoding" is set.
     if (_contentLength > 0) {
       _headers.set(HttpHeaders.CONTENT_LENGTH, _contentLength.toString());
     } else if (_contentLength < 0) {
       _headers.set(HttpHeaders.TRANSFER_ENCODING, "chunked");
     }
 
     // Add the cookies to the headers.
     if (_cookies != null) {
       StringBuffer sb = new StringBuffer();
       for (int i = 0; i < _cookies.length; i++) {
@@ skipping 59 matching lines @@
     // TODO(sgjesse): Error handling
   }
 
   void _onResponseStart(int statusCode, String reasonPhrase, String version) {
     _statusCode = statusCode;
     _reasonPhrase = reasonPhrase;
   }
 
   void _onHeaderReceived(String name, String value) {
     _headers.add(name, value);
-    if (name == "content-length") {
-      _contentLength = parseInt(value);
-    }
   }
 
   void _onHeadersComplete() {
+    // Get parsed content length.
+    _contentLength = _httpConnection._httpParser.contentLength;
+
+    // Prepare for receiving data.
     _headers._mutable = false;
     _buffer = new _BufferList();
+
     if (isRedirect && _connection.followRedirects) {
       if (_connection._redirects == null ||
           _connection._redirects.length < _connection.maxRedirects) {
         // Check the location header.
         List<String> location = headers[HttpHeaders.LOCATION];
         if (location == null || location.length > 1) {
            throw new RedirectException("Invalid redirect",
                                        _connection._redirects);
         }
         // Check for redirect loop
@@ skipping 550 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;
 }