Skip to content

Commit

Permalink
Merge pull request #2240 from zarenner/users/zarenner/removeConnectio…
Browse files Browse the repository at this point in the history
…nErrorHandler

Remove connectionErrorHandler to fix #1903
  • Loading branch information
simov committed Jul 9, 2016
2 parents 4f0f9f1 + bf86f17 commit 290111d
Showing 1 changed file with 0 additions and 24 deletions.
24 changes: 0 additions & 24 deletions request.js
Expand Up @@ -71,20 +71,6 @@ function filterOutReservedFunctions(reserved, options) {

}

// Function for properly handling a connection error
function connectionErrorHandler(error) {
var socket = this
if (socket.res) {
if (socket.res.request) {
socket.res.request.emit('error', error)
} else {
socket.res.emit('error', error)
}
} else {
socket._httpMessage.emit('error', error)
}
}

// Return a simpler request object to allow serialization
function requestToJSON() {
var self = this
Expand Down Expand Up @@ -805,11 +791,6 @@ Request.prototype.start = function () {
self.emit('socket', socket)
})

self.on('end', function() {
if ( self.req.connection ) {
self.req.connection.removeListener('error', connectionErrorHandler)
}
})
self.emit('request', self.req)
}

Expand Down Expand Up @@ -844,11 +825,6 @@ Request.prototype.onRequestResponse = function (response) {
debug('response end', self.uri.href, response.statusCode, response.headers)
})

// The check on response.connection is a workaround for browserify.
if (response.connection && response.connection.listeners('error').indexOf(connectionErrorHandler) === -1) {
response.connection.setMaxListeners(0)
response.connection.once('error', connectionErrorHandler)
}
if (self._aborted) {
debug('aborted', self.uri.href)
response.resume()
Expand Down

0 comments on commit 290111d

Please sign in to comment.