Skip to content

Commit

Permalink
http: DELETE shouldn't default to chunked encoding
Browse files Browse the repository at this point in the history
  • Loading branch information
lalitkapoor authored and trevnorris committed Dec 7, 2013
1 parent 0da4e0e commit aef0960
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 1 deletion.
5 changes: 4 additions & 1 deletion lib/_http_client.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@ function ClientRequest(options, cb) {
new Buffer(options.auth).toString('base64'));
}

if (method === 'GET' || method === 'HEAD' || method === 'CONNECT') {
if (method === 'GET' ||
method === 'HEAD' ||
method === 'DELETE' ||
method === 'CONNECT') {
self.useChunkedEncodingByDefault = false;
} else {
self.useChunkedEncodingByDefault = true;
Expand Down
65 changes: 65 additions & 0 deletions test/simple/test-http-client-default-headers-exist.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to permit
// persons to whom the Software is furnished to do so, subject to the
// following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.

var common = require('../common');
var assert = require('assert');
var http = require('http');

var expectedHeaders = {
'DELETE': ['host', 'connection'],
'GET': ['host', 'connection'],
'HEAD': ['host', 'connection'],
'POST': ['host', 'connection', 'transfer-encoding'],
'PUT': ['host', 'connection', 'transfer-encoding']
};

var expectedMethods = Object.keys(expectedHeaders);

var requestCount = 0;

var server = http.createServer(function(req, res) {
requestCount++;
res.end();

assert(expectedHeaders.hasOwnProperty(req.method),
req.method + ' was an unexpected method');

var requestHeaders = Object.keys(req.headers);
requestHeaders.forEach(function(header) {
assert(expectedHeaders[req.method].indexOf(header.toLowerCase()) !== -1,
header + ' shoud not exist for method ' + req.method);
});

assert(requestHeaders.length === expectedHeaders[req.method].length,
'some headers were missing for method: ' + req.method);

if (expectedMethods.length === requestCount)
server.close();
});

server.listen(common.PORT, function() {
expectedMethods.forEach(function(method) {
http.request({
method: method,
port: common.PORT
}).end();
});
});

0 comments on commit aef0960

Please sign in to comment.