Replace C HTTP parser with JS HTTP parser

LICENSE

@@ -186,33 +186,6 @@ The externally maintained libraries used by io.js are:
      */
   """
 
-- HTTP Parser, located at deps/http_parser. HTTP Parser's license follows:
-  """
-    http_parser.c is based on src/http/ngx_http_parse.c from NGINX copyright
-    Igor Sysoev.
-
-    Additional changes are licensed under the same terms as NGINX and
-    copyright Joyent, Inc. and other Node contributors. All rights reserved.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to
-    deal in the Software without restriction, including without limitation the
-    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-    sell copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-    IN THE SOFTWARE.
-  """
-
 - Closure Linter is located at tools/closure_linter. Closure's license
   follows:
   """

Makefile

@@ -39,7 +39,7 @@ $(NODE_G_EXE): config.gypi out/Makefile
 	$(MAKE) -C out BUILDTYPE=Debug V=$(V)
 	ln -fs out/Debug/$(NODE_EXE) $@
 
-out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp deps/v8/build/toolchain.gypi deps/v8/build/features.gypi deps/v8/tools/gyp/v8.gyp node.gyp config.gypi
+out/Makefile: common.gypi deps/uv/uv.gyp deps/zlib/zlib.gyp deps/v8/build/toolchain.gypi deps/v8/build/features.gypi deps/v8/tools/gyp/v8.gyp node.gyp config.gypi
 	$(PYTHON) tools/gyp_node.py -f make
 
 config.gypi: configure

Makefile.build

@@ -233,7 +233,6 @@ NACL_ARCHES = nacl_ia32 nacl_x64
 GYPFILES = \
 	common.gypi \
 	deps/cares/cares.gyp \
-	deps/http_parser/http_parser.gyp \
 	deps/openssl/openssl.gyp \
 	deps/uv/uv.gyp \
 	deps/v8/tools/gyp/v8.gyp \

benchmark/http/parser.js

@@ -0,0 +1,199 @@
+var common = require('../common.js');
+var HTTPParser = require('_http_parser');
+var CRLF = '\r\n';
+var REQUEST = HTTPParser.REQUEST;
+var RESPONSE = HTTPParser.RESPONSE;
+
+var bench = common.createBenchmark(main, {
+  n: [100000],
+  type: [
+    'small-req',
+    'small-res',
+    'small-alternate',
+    'medium-req',
+    'medium-res',
+    'medium-alternate',
+    'medium-req-chunked',
+    'medium-res-chunked',
+    'large-req',
+    'large-res',
+    'large-alternate',
+    'large-req-chunked',
+    'large-res-chunked',
+  ]
+});
+
+var inputs = {
+  'small-req': [
+    'GET /index.html HTTP/1.1' + CRLF +
+    'Host: www.example.com' + CRLF + CRLF
+  ],
+  'small-res': [
+    'HTTP/1.1 200 OK' + CRLF +
+    'Date: Mon, 23 May 2005 22:38:34 GMT' + CRLF + CRLF
+  ],
+  'small-alternate': true,
+  'medium-req': [
+    'POST /it HTTP/1.1' + CRLF +
+    'Content-Type: text/plain' + CRLF +
+    'Transfer-Encoding: chunked' + CRLF +
+    CRLF +
+    '3' + CRLF +
+    '123' + CRLF +
+    '6' + CRLF +
+    '123456' + CRLF +
+    'A' + CRLF +
+    '1234567890' + CRLF +
+    '9' + CRLF +
+    '123456789' + CRLF +
+    'C' + CRLF +
+    '123456789ABC' + CRLF +
+    'F' + CRLF +
+    '123456789ABCDEF' + CRLF +
+    '0' + CRLF
+  ],
+  'medium-res': [
+    'HTTP/1.0 200 OK' + CRLF +
+    'Date: Mon, 23 May 2005 22:38:34 GMT' + CRLF +
+    'Content-Type: text/plain' + CRLF +
+    'Transfer-Encoding: chunked' + CRLF +
+    CRLF +
+    '3' + CRLF +
+    '123' + CRLF +
+    '6' + CRLF +
+    '123456' + CRLF +
+    'A' + CRLF +
+    '1234567890' + CRLF +
+    '9' + CRLF +
+    '123456789' + CRLF +
+    'C' + CRLF +
+    '123456789ABC' + CRLF +
+    'F' + CRLF +
+    '123456789ABCDEF' + CRLF +
+    '0' + CRLF
+  ],
+  'medium-alternate': true,
+  'medium-req-chunked': [
+    'POST /it HTTP/',
+    '1.1' + CRLF,
+    'Content-Type',
+    ': text',
+    '/plain',
+    CRLF,
+    'Transfer-',
+    'Encoding: chunked' + CRLF,
+    CRLF + '3' + CRLF + '123',
+    CRLF + '6' + CRLF + '123456' + CRLF + 'A' + CRLF,
+    '12345',
+    '67890' + CRLF,
+    '9' + CRLF + '123456789' + CRLF,
+    'C' + CRLF + '123456789ABC' + CRLF + 'F' + CRLF + '123456789ABCDEF' + CRLF,
+    '0' + CRLF
+  ],
+  'medium-res-chunked': [
+    'HTTP/1.0 2',
+    '00 OK' + CRLF + 'Date: Mo',
+    'n, 23 May 2005 22',
+    ':38:34 GMT' + CRLF + 'Content-Type: text',
+    '/plain' + CRLF,
+    'Transfer-Encoding: chu',
+    'nked' + CRLF + CRLF + '3',
+    CRLF + '123' + CRLF + '6' + CRLF,
+    '123456' + CRLF + 'A' + CRLF + '1234567890' + CRLF,
+    '9' + CRLF,
+    '123456789' + CRLF,
+    'C' + CRLF,
+    '123456789ABC' + CRLF,
+    'F' + CRLF,
+    '123456789ABCDEF' + CRLF + '0' + CRLF
+  ],
+  'large-req': [
+    'POST /foo/bar/baz?quux=42#1337 HTTP/1.0' + CRLF +
+    new Array(256).join('X-Filler: 42' + CRLF) + CRLF
+  ],
+  'large-res': [
+    'HTTP/1.1 200 OK' + CRLF +
+    'Content-Type: text/nonsense' + CRLF,
+    'Content-Length: 3572' + CRLF + CRLF +
+    new Array(256).join('X-Filler: 42' + CRLF) + CRLF
+  ],
+  'large-alternate': true,
+  'large-req-chunked':
+    ('POST /foo/bar/baz?quux=42#1337 HTTP/1.0' + CRLF +
+    new Array(256).join('X-Filler: 42' + CRLF) + CRLF).match(/.{1,144}/g)
+  ,
+  'large-res-chunked':
+    ('HTTP/1.1 200 OK' + CRLF +
+     'Content-Type: text/nonsense' + CRLF,
+     'Content-Length: 3572' + CRLF + CRLF +
+     new Array(256).join('X-Filler: 42' + CRLF) + CRLF).match(/.{1,144}/g)
+  ,
+};
+
+function onHeaders(versionMajor, versionMinor, headers, method, url, statusCode,
+                   statusMessage, upgrade, shouldKeepAlive) {
+}
+function onBody(data, start, len) {
+}
+function onComplete() {
+}
+
+function main(conf) {
+  var type = conf.type;
+  var chunks = inputs[type];
+  var n = +conf.n;
+  var nchunks = (chunks !== true ? chunks.length : 1);
+  var kind = (/\-req\-?/i.exec(type) ? REQUEST : RESPONSE);
+  var altsize = /^([^\-]+)\-alternate$/.exec(type);
+  var req;
+  var res;
+
+  if (altsize)
+    altsize = altsize[1];
+
+  // Convert strings to Buffers first ...
+  if (chunks === true) {
+    // alternating
+    req = new Buffer(inputs[altsize + '-req'].join(''), 'binary');
+    res = new Buffer(inputs[altsize + '-res'].join(''), 'binary');
+    kind = REQUEST;
+  } else {
+    for (var i = 0; i < nchunks; ++i)
+      chunks[i] = new Buffer(chunks[i], 'binary');
+  }
+
+  var parser = new HTTPParser(kind);
+  parser.onHeaders = onHeaders;
+  parser.onBody = onBody;
+  parser.onComplete = onComplete;
+
+  if (altsize) {
+    // Allow V8 to optimize first ...
+    for (var j = 0; j < 1000; ++j) {
+      parser.reinitialize(REQUEST);
+      parser.execute(req);
+      parser.reinitialize(RESPONSE);
+      parser.execute(res);
+    }
+    bench.start();
+    for (var c = 0; c < n; ++c) {
+      parser.reinitialize(REQUEST);
+      parser.execute(req);
+      parser.reinitialize(RESPONSE);
+      parser.execute(res);
+    }
+    bench.end(n * 2);
+  } else {
+    // Allow V8 to optimize first ...
+    for (var j = 0; j < 1000; ++j) {
+      for (var i = 0; i < nchunks; ++i)
+        parser.execute(chunks[i]);
+    }
+    bench.start();
+    for (var c = 0; c < n; ++c) {
+      for (var i = 0; i < nchunks; ++i)
+        parser.execute(chunks[i]);
+    }
+    bench.end(n * nchunks);
+  }
+}

configure

@@ -93,27 +93,6 @@ parser.add_option('--openssl-fips',
     dest='openssl_fips',
     help='Build OpenSSL using FIPS canister .o file in supplied folder')
 
-shared_optgroup.add_option('--shared-http-parser',
-    action='store_true',
-    dest='shared_http_parser',
-    help='link to a shared http_parser DLL instead of static linking')
-
-shared_optgroup.add_option('--shared-http-parser-includes',
-    action='store',
-    dest='shared_http_parser_includes',
-    help='directory containing http_parser header files')
-
-shared_optgroup.add_option('--shared-http-parser-libname',
-    action='store',
-    dest='shared_http_parser_libname',
-    default='http_parser',
-    help='alternative lib name to link to [default: %default]')
-
-shared_optgroup.add_option('--shared-http-parser-libpath',
-    action='store',
-    dest='shared_http_parser_libpath',
-    help='a directory to search for the shared http_parser DLL')
-
 shared_optgroup.add_option('--shared-libuv',
     action='store_true',
     dest='shared_libuv',
@@ -1017,7 +996,6 @@ flavor = GetFlavor(flavor_params)
 
 configure_node(output)
 configure_library('zlib', output)
-configure_library('http_parser', output)
 configure_library('libuv', output)
 configure_v8(output)
 configure_openssl(output)