nodejs
diff --git a/‎lib/_http_client.js‎
Lines changed: 1 addition & 1 deletion b/‎lib/_http_client.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎test/parallel/test-http-parser-freed-before-upgrade.js‎
Lines changed: 33 additions & 0 deletions b/‎test/parallel/test-http-parser-freed-before-upgrade.js‎
Lines changed: 33 additions & 0 deletions
@@ -453,6 +453,7 @@ function socketOnData(d) {
     socket.removeListener('data', socketOnData);
     socket.removeListener('end', socketOnEnd);
     parser.finish();
+    freeParser(parser, req, socket);
 
     var bodyHead = d.slice(bytesParsed, d.length);
 
@@ -475,7 +476,6 @@ function socketOnData(d) {
       // Got Upgrade header or CONNECT method, but have no handler.
       socket.destroy();
     }
-    freeParser(parser, req, socket);
   } else if (parser.incoming && parser.incoming.complete &&
              // When the status code is 100 (Continue), the server will
              // send a final response after this client sends a request
 
@@ -0,0 +1,33 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const http = require('http');
+
+const server = http.createServer();
+
+server.on('upgrade', common.mustCall((request, socket) => {
+  assert.strictEqual(socket.parser, null);
+  socket.write([
+    'HTTP/1.1 101 Switching Protocols',
+    'Connection: Upgrade',
+    'Upgrade: WebSocket',
+    '\r\n'
+  ].join('\r\n'));
+}));
+
+server.listen(common.mustCall(() => {
+  const request = http.get({
+    port: server.address().port,
+    headers: {
+      Connection: 'Upgrade',
+      Upgrade: 'WebSocket'
+    }
+  });
+
+  request.on('upgrade', common.mustCall((response, socket) => {
+    assert.strictEqual(socket.parser, null);
+    socket.destroy();
+    server.close();
+  }));
+}));