WIP

nodejs · Oct 20, 2011 · 30deb31 · 30deb31
1 parent 145aa63
commit 30deb31
Show file tree

Hide file tree

Showing 3 changed files with 829 additions and 172 deletions.
diff --git a/lib/http.js b/lib/http.js
@@ -37,65 +37,59 @@ if (process.env.NODE_DEBUG && /http/.test(process.env.NODE_DEBUG)) {
 
 
 var parsers = new FreeList('parsers', 1000, function() {
-  var parser = new HTTPParser('request');
-
-  parser.onMessageBegin = function() {
-    parser.incoming = new IncomingMessage(parser.socket);
-    parser.field = null;
-    parser.value = null;
-  };
-
-  // Only servers will get URL events.
-  parser.onURL = function(b, start, len) {
-    var slice = b.toString('ascii', start, start + len);
-    if (parser.incoming.url) {
-      parser.incoming.url += slice;
-    } else {
-      // Almost always will branch here.
-      parser.incoming.url = slice;
-    }
+  var parser = new HTTPParser(HTTPParser.REQUEST);
+
+  parser._headers = [];
+  parser._url = '';
+
+  // Only called in the slow case where slow means
+  // that the request headers were either fragmented
+  // across multiple TCP packets or too large to be
+  // processed in a single run. This method is also
+  // called to process trailing HTTP headers.
+  parser.onHeaders = function(headers, url) {
+    parser._headers = parser._headers.concat(headers);
+    parser._url += url;
   };
 
-  parser.onHeaderField = function(b, start, len) {
-    var slice = b.toString('ascii', start, start + len).toLowerCase();
-    if (parser.value != undefined) {
-      parser.incoming._addHeaderLine(parser.field, parser.value);
-      parser.field = null;
-      parser.value = null;
-    }
-    if (parser.field) {
-      parser.field += slice;
-    } else {
-      parser.field = slice;
-    }
-  };
+  // info.headers and info.url are set only if .onHeaders()
+  // has not been called for this request.
+  //
+  // info.url is not set for response parsers but that's not
+  // applicable here since all our parsers are request parsers.
+  parser.onHeadersComplete = function(info) {
+    var headers = info.headers;
+    var url = info.url;
 
-  parser.onHeaderValue = function(b, start, len) {
-    var slice = b.toString('ascii', start, start + len);
-    if (parser.value) {
-      parser.value += slice;
-    } else {
-      parser.value = slice;
+    if (!headers) {
+      headers = parser._headers;
+      parser._headers = [];
     }
-  };
 
-  parser.onHeadersComplete = function(info) {
-    if (parser.field && (parser.value != undefined)) {
-      parser.incoming._addHeaderLine(parser.field, parser.value);
-      parser.field = null;
-      parser.value = null;
+    if (!url) {
+      url = parser._url;
+      parser._url = '';
     }
 
+    parser.incoming = new IncomingMessage(parser.socket);
     parser.incoming.httpVersionMajor = info.versionMajor;
     parser.incoming.httpVersionMinor = info.versionMinor;
     parser.incoming.httpVersion = info.versionMajor + '.' + info.versionMinor;
+    parser.incoming.url = url;
+
+    for (var i = 0, n = headers.length; i < n; i += 2) {
+      var k = headers[i];
+      var v = headers[i + 1];
+      parser.incoming._addHeaderLine(k.toLowerCase(), v);
+    }
 
     if (info.method) {
       // server only
       parser.incoming.method = info.method;
     } else {
       // client only
       parser.incoming.statusCode = info.statusCode;
+      // CHECKME dead code? we're always a request parser
     }
 
     parser.incoming.upgrade = info.upgrade;
@@ -123,10 +117,20 @@ var parsers = new FreeList('parsers', 1000, function() {
   };
 
   parser.onMessageComplete = function() {
-    this.incoming.complete = true;
-    if (parser.field && (parser.value != undefined)) {
-      parser.incoming._addHeaderLine(parser.field, parser.value);
+    parser.incoming.complete = true;
+
+    // Emit any trailing headers.
+    var headers = parser._headers;
+    if (headers) {
+      for (var i = 0, n = headers.length; i < n; i += 2) {
+        var k = headers[i];
+        var v = headers[i + 1];
+        parser.incoming._addHeaderLine(k.toLowerCase(), v);
+      }
+      parser._headers = [];
+      parser._url = '';
     }
+
     if (!parser.incoming.upgrade) {
       // For upgraded connections, also emit this after parser.execute
       parser.incoming.readable = false;
@@ -1088,7 +1092,7 @@ ClientRequest.prototype.onSocket = function(socket) {
     var parser = parsers.alloc();
     req.socket = socket;
     req.connection = socket;
-    parser.reinitialize('response');
+    parser.reinitialize(HTTPParser.RESPONSE);
     parser.socket = socket;
     parser.incoming = null;
     req.parser = parser;
@@ -1346,7 +1350,7 @@ function connectionListener(socket) {
   });
 
   var parser = parsers.alloc();
-  parser.reinitialize('request');
+  parser.reinitialize(HTTPParser.REQUEST);
   parser.socket = socket;
   parser.incoming = null;