http: updated tests and close connection

Author: marco-ippolito

lib/_http_server.js

@@ -1024,7 +1024,7 @@ function parserOnIncoming(server, socket, state, req, keepAlive) {
     // A server MUST respond with a 400 (Bad Request) status code to any
     // HTTP/1.1 request message that lacks a Host header field
     if (req.headers.host === undefined) {
-      res.writeHead(400);
+      res.writeHead(400, ['Connection', 'close']);
       res.end();
       return 0;
     }

test/parallel/test-http-keep-alive-drop-requests.js

@@ -8,6 +8,7 @@ const assert = require('assert');
 function request(socket) {
   socket.write('GET / HTTP/1.1\r\n');
   socket.write('Connection: keep-alive\r\n');
+  socket.write('Host: localhost\r\n');
   socket.write('\r\n\r\n');
 }
 

test/parallel/test-http-keep-alive-max-requests.js

@@ -24,12 +24,14 @@ function writeRequest(socket, withBody) {
     socket.write('POST / HTTP/1.1\r\n');
     socket.write('Connection: keep-alive\r\n');
     socket.write('Content-Type: text/plain\r\n');
+    socket.write('Host: localhost\r\n');
     socket.write(`Content-Length: ${bodySent.length}\r\n\r\n`);
     socket.write(`${bodySent}\r\n`);
     socket.write('\r\n\r\n');
   } else {
     socket.write('GET / HTTP/1.1\r\n');
     socket.write('Connection: keep-alive\r\n');
+    socket.write('Host: localhost\r\n');
     socket.write('\r\n\r\n');
   }
 }

test/parallel/test-http-request-host-header.js

@@ -14,6 +14,7 @@ const server = http.createServer(common.mustNotCall((req, res) => {
 server.listen(0, common.mustCall(() => {
   http.get({ port: server.address().port, headers: [] }, (res) => {
     assert.strictEqual(res.statusCode, 400);
+    assert.strictEqual(res.headers.connection, 'close');
     res.resume().on('end', common.mustCall(() => {
       server.close();
     }));

test/parallel/test-http-server-close-all.js

@@ -50,7 +50,7 @@ server.listen(0, function() {
 
     client2.on('close', common.mustCall());
 
-    client2.write('GET / HTTP/1.1\r\n\r\n');
+    client2.write('GET / HTTP/1.1\r\nHost: example.com\r\n\r\n');
   }));
 
   client1.on('close', common.mustCall());

test/parallel/test-http-server-close-idle.js

@@ -60,7 +60,7 @@ server.listen(0, function() {
       client2Closed = true;
     }));
 
-    client2.write('GET / HTTP/1.1\r\n\r\n');
+    client2.write('GET / HTTP/1.1\r\nHost: example.com\r\n\r\n');
   }));
 
   client1.on('close', common.mustCall(() => {

test/parallel/test-http-server-headers-timeout-keepalive.js

@@ -12,7 +12,7 @@ const { connect } = require('net');
 
 function performRequestWithDelay(client, firstDelay, secondDelay, closeAfter) {
   client.resume();
-  client.write('GET / HTTP/1.1\r\n');
+  client.write('GET / HTTP/1.1\r\nHost: example.com\r\n');
 
   setTimeout(() => {
     client.write('Connection: ');

test/parallel/test-http-server-headers-timeout-pipelining.js

@@ -66,7 +66,7 @@ server.listen(0, common.mustCall(() => {
 
   // Send two requests using pipelining. Delay before finishing the second one
   client.resume();
-  client.write('GET / HTTP/1.1\r\nConnection: keep-alive\r\n\r\nGET / HTTP/1.1\r\nConnection: ');
+  client.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: keep-alive\r\n\r\nGET / HTTP/1.1\r\nHost: localhost\r\nConnection: ');
 
   // Complete the request
   setTimeout(() => {

test/parallel/test-http-server-request-timeout-pipelining.js

@@ -60,7 +60,7 @@ server.listen(0, common.mustCall(() => {
 
   // Send two requests using pipelining. Delay before finishing the second one
   client.resume();
-  client.write('GET / HTTP/1.1\r\nConnection: keep-alive\r\n\r\nGET / HTTP/1.1\r\nConnection: ');
+  client.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: keep-alive\r\n\r\nGET / HTTP/1.1\r\nHost: localhost\r\nConnection: ');
 
   // Complete the request
   setTimeout(() => {

test/parallel/test-http-server-request-timeouts-mixed.js

@@ -7,7 +7,7 @@ const { connect } = require('net');
 
 // This test validates that request are correct checked for both requests and headers timeout in various situations.
 
-const requestBodyPart1 = 'POST / HTTP/1.1\r\nContent-Length: 20\r\n';
+const requestBodyPart1 = 'POST / HTTP/1.1\r\nHost: localhost\r\nContent-Length: 20\r\n';
 const requestBodyPart2 = 'Connection: close\r\n\r\n1234567890';
 const requestBodyPart3 = '1234567890';
 

test/parallel/test-https-host-headers.js

@@ -25,7 +25,7 @@ const httpsServer = https.createServer({
   }
   res.writeHead(200, {});
   res.end('ok');
-}, 9)).listen(0, common.mustCall(function(err) {
+}, 6)).listen(0, common.mustCall(function(err) {
   debug(`test https server listening on port ${this.address().port}`);
   assert.ifError(err);
   https.get({

test/parallel/test-https-keep-alive-drop-requests.js

@@ -13,7 +13,7 @@ const tls = require('tls');
 const { readKey } = require('../common/fixtures');
 
 function request(socket) {
-  socket.write('GET / HTTP/1.1\r\nConnection: keep-alive\r\n\r\n\r\n');
+  socket.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: keep-alive\r\n\r\n\r\n');
 }
 
 // https options

test/parallel/test-https-server-close-all.js

@@ -60,7 +60,7 @@ server.listen(0, function() {
 
     client2.on('close', common.mustCall());
 
-    client2.write('GET / HTTP/1.1\r\n\r\n');
+    client2.write('GET / HTTP/1.1\r\nHost: example.com\r\n\r\n');
   }));
 
   client1.on('close', common.mustCall());

test/parallel/test-https-server-close-idle.js

@@ -70,7 +70,7 @@ server.listen(0, function() {
       client2Closed = true;
     }));
 
-    client2.write('GET / HTTP/1.1\r\n\r\n');
+    client2.write('GET / HTTP/1.1\r\nHost: localhost\r\n\r\n');
   }));
 
   client1.on('close', common.mustCall(() => {