Merge branch 'http2' into http2-benchmark

lib/core/request.js

@@ -174,7 +174,11 @@ class Request {
       const keys = Object.keys(headers)
       for (let i = 0; i < keys.length; i++) {
         const key = keys[i]
-        processHeader(this, key, headers[key])
+        const headerValue = headers[key]
+        processHeader(this, key, headerValue)
+        this[kRawRequestHeaders] = {
+          [key]: headerValue
+        }
       }
       this[kRawRequestHeaders] = headers
     } else if (headers != null) {

test/http2.js

@@ -11,7 +11,7 @@ const pem = require('https-pem')
 
 const { Client } = require('..')
 
-plan(15)
+plan(16)
 
 test('Should support H2 connection', async t => {
   const body = []
@@ -60,6 +60,51 @@ test('Should support H2 connection', async t => {
   t.equal(Buffer.concat(body).toString('utf8'), 'hello h2!')
 })
 
+test('Should support H2 connection (headers as array)', async t => {
+  const body = []
+  const server = createSecureServer(pem)
+
+  server.on('stream', (stream, headers) => {
+    t.equal(headers['x-my-header'], 'foo')
+    t.equal(headers[':method'], 'GET')
+    stream.respond({
+      'content-type': 'text/plain; charset=utf-8',
+      'x-custom-h2': 'hello',
+      ':status': 200
+    })
+    stream.end('hello h2!')
+  })
+
+  server.listen(0)
+  await once(server, 'listening')
+
+  const client = new Client(`https://localhost:${server.address().port}`, {
+    connect: {
+      rejectUnauthorized: false
+    }
+  })
+
+  t.plan(6)
+  t.teardown(server.close.bind(server))
+  t.teardown(client.close.bind(client))
+
+  const response = await client.request({
+    path: '/',
+    method: 'GET',
+    headers: ['x-my-header', 'foo']
+  })
+
+  response.body.on('data', chunk => {
+    body.push(chunk)
+  })
+
+  await once(response.body, 'end')
+  t.equal(response.statusCode, 200)
+  t.equal(response.headers['content-type'], 'text/plain; charset=utf-8')
+  t.equal(response.headers['x-custom-h2'], 'hello')
+  t.equal(Buffer.concat(body).toString('utf8'), 'hello h2!')
+})
+
 test('Should support H2 GOAWAY (server-side)', async t => {
   const body = []
   const server = createSecureServer(pem)