Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

http: fix http-parser is freed twice

after response to CONNECT/Upgrade request.

Fixes #2704.
  • Loading branch information
koichik committed Feb 6, 2012
1 parent 832efb1 commit c2dc673eb5a7a6a706b024a5e501cd3939ad399b
Showing with 90 additions and 2 deletions.
  1. +1 −2 lib/http.js
  2. +89 −0 test/simple/test-http-after-connect.js
@@ -1217,7 +1217,7 @@ ClientRequest.prototype.onSocket = function(socket) {
socket.ondata = null;
socket.onend = null;
parser.finish();
parsers.free(parser);
freeParser();

// This is start + byteParsed
var bodyHead = d.slice(start + bytesParsed, end);
@@ -1237,7 +1237,6 @@ ClientRequest.prototype.onSocket = function(socket) {
// Got Upgrade header or CONNECT method, but have no handler.
socket.destroy();
}
freeParser();
} 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,89 @@
// 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 serverConnected = false;
var serverRequests = 0;
var clientResponses = 0;

var server = http.createServer(function(req, res) {
common.debug('Server got GET request');
++serverRequests;
res.writeHead(200);
res.write('');
setTimeout(function() {
res.end(req.url);
}, 50);
});
server.on('connect', function(req, socket, firstBodyChunk) {
common.debug('Server got CONNECT request');
serverConnected = true;
socket.write('HTTP/1.1 200 Connection established\r\n\r\n');
socket.on('end', function() {
socket.end();
});
});
server.listen(common.PORT, function() {
var req = http.request({
port: common.PORT,
method: 'CONNECT',
path: 'google.com:80'
});
req.on('connect', function(res, socket, firstBodyChunk) {
common.debug('Client got CONNECT response');
socket.end();
socket.on('end', function() {
doRequest(0);
doRequest(1);
});
});
req.end();
});

function doRequest(i) {
var req = http.get({
port: common.PORT,
path: '/request' + i
}, function(res) {
common.debug('Client got GET response');
var data = '';
res.setEncoding('utf8');
res.on('data', function(chunk) {
data += chunk;
});
res.on('end', function() {
assert.equal(data, '/request' + i);
++clientResponses;
if (clientResponses === 2) {
server.close();
}
});
});
}

process.on('exit', function() {
assert(serverConnected);
assert.equal(serverRequests, 2);
assert.equal(clientResponses, 2);
});

0 comments on commit c2dc673

Please sign in to comment.
You can’t perform that action at this time.