From Map() to basic {}.

mcollina · mcollina · commit d5025de68d03 · 2016-12-06T12:59:24.000+01:00
diff --git a/lib/internal/http2.js b/lib/internal/http2.js
@@ -628,8 +628,8 @@ class Http2Incoming extends Readable {
     super(initHttp2IncomingOptions(options));
     if (!(stream instanceof Http2Stream))
       throw new TypeError('stream argument must be an Http2Stream instance');
-    if (!(headers instanceof Map))
-      throw new TypeError('headers argument must be a Map');
+    if (typeof headers !== 'object')
+      throw new TypeError('headers argument must be an object');
     this[kStream] = stream;
     this[kHeaders] = headers;
     this[kFinished] = false;
@@ -679,19 +679,19 @@ class Http2ServerRequest extends Http2Incoming {
   }
 
   get method() {
-    return this.headers.get(constants.HTTP2_HEADER_METHOD);
+    return this.headers[constants.HTTP2_HEADER_METHOD];
   }
 
   get authority() {
-    return this.headers.get(constants.HTTP2_HEADER_AUTHORITY);
+    return this.headers[constants.HTTP2_HEADER_AUTHORITY];
   }
 
   get scheme() {
-    return this.headers.get(constants.HTTP2_HEADER_SCHEME);
+    return this.headers[constants.HTTP2_HEADER_SCHEME];
   }
 
   get url() {
-    return this.headers.get(constants.HTTP2_HEADER_PATH);
+    return this.headers[constants.HTTP2_HEADER_PATH];
   }
 }
 
@@ -762,10 +762,12 @@ class Http2Outgoing extends Writable {
   }
 
   addHeaders(headers) {
-    if (!headers) return;
-    const keys = Object.keys(headers);
-    for (const key of keys)
-      this.setHeader(key, headers[key]);
+    var keys;
+    if (headers) {
+      keys = Object.keys(headers);
+      for (var i = 0; i < keys.length; i++)
+        this.setHeader(keys[i], headers[keys[i]]);
+    }
     return this;
   }
 
@@ -1566,31 +1568,31 @@ class Http2ClientRequest extends Http2Outgoing {
 
   setHeader(name, value) {
     name = String(name).toLowerCase().trim();
-    if (this[kHeaders].has(name)) {
-      const existing = this[kHeaders].get(name);
+    const existing = this[kHeaders][name];
+    if (existing) {
       if (Array.isArray(existing)) {
         existing.push(String(value));
       } else {
-        this[kHeaders].set(name, [existing, value]);
+        this[kHeaders][name] = [existing, value];
       }
     } else {
-      this[kHeaders].set(name, value);
+      this[kHeaders][name] = value;
     }
   }
 
   setTrailer(name, value) {
     if (!this[kTrailers])
-      this[kTrailers] = new Map();
+      this[kTrailers] = {};
     name = String(name).toLowerCase().trim();
-    if (this[kTrailers].has(name)) {
-      const existing = this[kTrailers].get(name);
+    const existing = this[kTrailers][name];
+    if (existing) {
       if (Array.isArray(existing)) {
         existing.push(String(value));
       } else {
-        this[kTrailers].set(name, [existing, value]);
+        this[kTrailers][name] = [existing, value];
       }
     } else {
-      this[kTrailers].set(name, value);
+      this[kTrailers][name] = value;
     }
   }
 
@@ -1613,13 +1615,13 @@ class Http2ClientRequest extends Http2Outgoing {
 
 function addTrailers () {
   const request = this[kRequest];
-  if (request[kTrailers] instanceof Map) {
-    for (const v of request[kTrailers]) {
-      const key = String(v[0]);
-      const value = v[1];
+  if (request[kTrailers]) {
+    // key is coerced on a string on set
+    for (var key in request[kTrailers]) {
+      const value = request[kTrailers][key];
       if (Array.isArray(value) && value.length > 0) {
-        for (const item of value)
-          this.addTrailer(key, String(item));
+        for (var i = 0; i < value.length; i++)
+          this.addTrailer(key, String(value[i]));
       } else {
         this.addTrailer(key, String(value));
       }
