Merge 0fb0c22 into 1ba557c

.travis.yml

@@ -10,8 +10,8 @@ node_js:
   - "5.12"
   - "6.12"
   - "7.10"
-  - "8.9"
-  - "9.3"
+  - "8.11"
+  - "10.7"
 sudo: false
 cache:
   directories:
@@ -23,6 +23,7 @@ before_install:
   # Setup Node.js version-specific dependencies
   - "test $TRAVIS_NODE_VERSION != '0.8' || npm rm --save-dev istanbul"
   - "test $(echo $TRAVIS_NODE_VERSION | cut -d. -f1) -ge 4 || npm rm --save-dev $(grep -E '\"eslint\\S*\"' package.json | cut -d'\"' -f2)"
+  - "test -z $(echo $HTTP2_TEST) || npm install --only=dev https://github.com/sogaani/supertest.git#http2"
 
   # Update Node.js modules
   - "test ! -d node_modules || npm prune"
@@ -34,3 +35,10 @@ script:
   - "test   -z $(npm -ps ls eslint  ) || npm run-script lint"
 after_script:
   - "test -e ./coverage/lcov.info && npm install coveralls@2 && cat ./coverage/lcov.info | coveralls"
+
+matrix:
+  include:
+    - node_js: "8.11"
+      env: HTTP2_TEST=1
+    - node_js: "10.7"
+      env: HTTP2_TEST=1

index.js

@@ -74,7 +74,7 @@ function vhost (hostname, handle) {
  */
 
 function hostnameof (req) {
-  var host = req.headers.host
+  var host = req.headers.host ? req.headers.host : req.headers[':authority']
 
   if (!host) {
     return
@@ -137,7 +137,7 @@ function hostregexp (val) {
  */
 
 function vhostof (req, regexp) {
-  var host = req.headers.host
+  var host = req.headers.host ? req.headers.host : req.headers[':authority']
   var hostname = hostnameof(req)
 
   if (!hostname) {

package.json

@@ -31,6 +31,7 @@
   "scripts": {
     "lint": "eslint --plugin markdown --ext js,md .",
     "test": "mocha --reporter spec --bail --check-leaks test/",
+    "test-http2": "HTTP2_TEST=1 mocha --reporter spec --bail --check-leaks test/",
     "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/",
     "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/"
   }

test/test.js

@@ -4,6 +4,11 @@ var http = require('http')
 var request = require('supertest')
 var vhost = require('..')
 
+if (process.env.HTTP2_TEST) {
+  request.http2 = true
+  http = require('http2')
+}
+
 describe('vhost(hostname, server)', function () {
   it('should route by Host', function (done) {
     var vhosts = []