Change the HTTP Content-Length handling

sdk/lib/io/http_parser.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.
 
 part of dart.io;
 
 // Global constants.
 class _Const {
   // Bytes for "HTTP".
   static const HTTP = const [72, 84, 84, 80];
@@ skipping 369 matching lines @@
             _state = _State.HEADER_VALUE_FOLD_OR_END;
             break;
 
           case _State.HEADER_VALUE_FOLD_OR_END:
             if (byte == _CharCode.SP || byte == _CharCode.HT) {
               _state = _State.HEADER_VALUE_START;
             } else {
               String headerField = new String.fromCharCodes(_headerField);
               String headerValue = new String.fromCharCodes(_headerValue);
               bool reportHeader = true;
-              if (headerField == "content-length" && !_chunked) {
-                // Ignore the Content-Length header if Transfer-Encoding
-                // is chunked (RFC 2616 section 4.4)
-                _contentLength = parseInt(headerValue);
-              } else if (headerField == "connection") {
+              if (headerField == "connection") {
                 List<String> tokens = _tokenizeFieldValue(headerValue);
                 for (int i = 0; i < tokens.length; i++) {
                   String token = tokens[i].toLowerCase();
                   if (token == "keep-alive") {
                     _persistentConnection = true;
                   } else if (token == "close") {
                     _persistentConnection = false;
                   } else if (token == "upgrade") {
                     _connectionUpgrade = true;
                   }
                   _headers.add(headerField, token);
 
                 }
                 reportHeader = false;
               } else if (headerField == "transfer-encoding" &&
                          headerValue.toLowerCase() == "chunked") {
-                // Ignore the Content-Length header if Transfer-Encoding
-                // is chunked (RFC 2616 section 4.4)
                 _chunked = true;
-                _contentLength = -1;
               }
               if (reportHeader) {
                 _headers.add(headerField, headerValue);
               }
               _headerField.clear();
               _headerValue.clear();
 
               if (byte == _CharCode.CR) {
                 _state = _State.HEADER_ENDING;
               } else {
                 // Start of new header field.
                 _headerField.add(_toLowerCase(byte));
                 _state = _State.HEADER_FIELD;
               }
             }
             break;
 
           case _State.HEADER_ENDING:
             _expect(byte, _CharCode.LF);
+
+            _contentLength = _headers.contentLength;

[Anders Johnsen, 2012/12/19 15:43:58]

Nice cleanup!

[Søren Gjesse, 2012/12/20 07:39:01]

Thanks.

+            // Ignore the Content-Length header if Transfer-Encoding
+            // is chunked (RFC 2616 section 4.4)
+            if (_chunked) _contentLength = -1;
+
             // If a request message has neither Content-Length nor
             // Transfer-Encoding the message must not have a body (RFC
             // 2616 section 4.3).
             if (_messageType == _MessageType.REQUEST &&
                 _contentLength < 0 &&
                 _chunked == false) {
               _contentLength = 0;
             }
             if (_connectionUpgrade) {
               _state = _State.UPGRADED;
@@ skipping 341 matching lines @@
   Function error;
   Function closed;
 }
 
 
 class HttpParserException implements Exception {
   const HttpParserException([String this.message = ""]);
   String toString() => "HttpParserException: $message";
   final String message;
 }