1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

http: close connection on 204 and chunked encoding

Browse Source 
This is similar to commit 2cbf458 but this time for 204 No Content
instead of 304 Not Modified responses.

When the user sends a 204 response with a Transfer-Encoding: chunked
header, suppress sending the zero chunk and force the connection to
close.
This commit is contained in:
Ben Noordhuis 2013-01-23 13:47:29 +01:00
parent 0774798ce0
commit 4a7a98fd0a
2 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/http.js
View File

@ -564,18 +564,22 @@ OutgoingMessage.prototype._storeHeader = function(firstLine, headers) {
state.messageHeader += 'Date: ' + utcDate() + CRLF; state.messageHeader += 'Date: ' + utcDate() + CRLF;
} }
// Force the connection to close when the response is a 304 Not Modified // Force the connection to close when the response is a 204 No Content or
// and the user has set a "Transfer-Encoding: chunked" header. // a 304 Not Modified and the user has set a "Transfer-Encoding: chunked"
// header.
// //
// RFC 2616 mandates that 304 responses MUST NOT have a body but node.js // RFC 2616 mandates that 204 and 304 responses MUST NOT have a body but
// used to send out a zero chunk anyway to accommodate clients that don't // node.js used to send out a zero chunk anyway to accommodate clients
// have special handling for 304 responses. // that don't have special handling for those responses.
// //
// It was pointed out that this might confuse reverse proxies to the point // It was pointed out that this might confuse reverse proxies to the point
// of creating security liabilities, so suppress the zero chunk and force // of creating security liabilities, so suppress the zero chunk and force
// the connection to close. // the connection to close.
if (this.statusCode === 304 && this.chunkedEncoding === true) { var statusCode = this.statusCode;
debug('304 response should not use chunked encoding, closing connection.'); if ((statusCode == 204 || statusCode === 304) &&
this.chunkedEncoding === true) {
debug(statusCode + ' response should not use chunked encoding,' +
' closing connection.');
this.chunkedEncoding = false; this.chunkedEncoding = false;
this.shouldKeepAlive = false; this.shouldKeepAlive = false;
} }

54
test/simple/test-http-chunked-304.js
View File

@ -24,32 +24,40 @@ var assert = require('assert');
var http = require('http'); var http = require('http');
var net = require('net'); var net = require('net');
// RFC 2616, section 10.3.5: // RFC 2616, section 10.2.5:
// //
// The 304 response MUST NOT contain a message-body, and thus is always // The 204 response MUST NOT contain a message-body, and thus is always
// terminated by the first empty line after the header fields. // terminated by the first empty line after the header fields.
// //
// Verify that no empty chunk is sent when the user explicitly sets // Likewise for 304 responses. Verify that no empty chunk is sent when
// a Transfer-Encoding header. // the user explicitly sets a Transfer-Encoding header.
var server = http.createServer(function(req, res) {
res.writeHead(304, { 'Transfer-Encoding': 'chunked' }); test(204, function() {
res.end(); test(304);
server.close();
}); });
server.listen(common.PORT, function() { function test(statusCode, next) {
var conn = net.createConnection(common.PORT, function() { var server = http.createServer(function(req, res) {
conn.write('GET / HTTP/1.1\r\n\r\n'); res.writeHead(statusCode, { 'Transfer-Encoding': 'chunked' });
res.end();
var resp = ''; server.close();
conn.setEncoding('utf8');
conn.on('data', function(data) {
resp += data;
});
conn.on('end', common.mustCall(function() {
assert.equal(/^Connection: close\r\n$/m.test(resp), true);
assert.equal(/^0\r\n$/m.test(resp), false);
}));
}); });
});
server.listen(common.PORT, function() {
var conn = net.createConnection(common.PORT, function() {
conn.write('GET / HTTP/1.1\r\n\r\n');
var resp = '';
conn.setEncoding('utf8');
conn.on('data', function(data) {
resp += data;
});
conn.on('end', common.mustCall(function() {
assert.equal(/^Connection: close\r\n$/m.test(resp), true);
assert.equal(/^0\r\n$/m.test(resp), false);
if (next) process.nextTick(next);
}));
});
});
}