fixup

Author: ronag

examples/proxy/proxy.js

@@ -102,12 +102,11 @@ class WSHandler {
       socket.unshift(this.head)
     }
 
-    headers = copyHeaders(headers, null)
-
     setupSocket(socket)
 
     let head = 'HTTP/1.1 101 Switching Protocols\r\nconnection: upgrade\r\nupgrade: websocket'
 
+    headers = copyHeaders(headers, null)
     for (let n = 0; n < headers.length; n += 2) {
       const key = headers[n + 0]
       const val = headers[n + 1]
@@ -148,20 +147,20 @@ function getRequestHeaders (ctx) {
     const key = headers[n + 0]
     const val = headers[n + 1]
 
-    if (!via && key.length === 3 && /^via$/i.test(key)) {
+    if (!via && key.length === 3 && key.toLowerCase() === 'via') {
       via = val
-    } else if (!host && key.length === 4 && /^host$/i.test(key)) {
+    } else if (!host && key.length === 4 && key.toLowerCase() === 'host') {
       host = val
-    } else if (!forwarded && key.length === 9 && /^forwarded$/.test(key)) {
+    } else if (!forwarded && key.length === 9 && key.toLowerCase() === 'forwarded') {
       forwarded = val
-    } else if (!authority && key.length === 10 && /^:authority$/i.test(key)) {
-      authority = val
-    } else if (!connection && key.length === 10 && /^connection$/i.test(key)) {
+    } else if (!connection && key.length === 10 && key.toLowerCase() === 'connection') {
       connection = val
+    } else if (!authority && key.length === 10 && key === ':authority') {
+      authority = val
     }
   }
 
-  const result = copyHeaders(headers)
+  const result = copyHeaders(headers, connection)
 
   // TODO(fix): <host> [ ":" <port> ] vs <pseudonym>
   // See, https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Via.
@@ -189,18 +188,18 @@ function getRequestHeaders (ctx) {
   return result
 }
 
-// This expression matched hop-by-hop headers.
+// This expression matches hop-by-hop headers.
 // These headers are meaningful only for a single transport-level connection,
 // and must not be retransmitted by proxies or cached.
-// Note that only hop-by-hop headers may be set using the Connection general header.
 const HOP_EXPR = /^(te|host|upgrade|trailers|connection|keep-alive|http2-settings|transfer-encoding|proxy-connection|proxy-authenticate|proxy-authorization)$/i
 
 // Removes hop-by-hop and pseudo headers.
+// Only hop-by-hop headers may be set using the Connection general header.
 function copyHeaders (headers, connection) {
   if (!connection) {
     for (let n = 0; n < headers.length; n += 2) {
       const key = headers[n + 0]
-      if (key.length === 10 && /^connection$/i.test(key)) {
+      if (key.length === 10 && key.toLowerCase() === 'connection') {
         connection = headers[n + 1]
         break
       }