Skip to content

Commit

Permalink
http: emit abort event from ClientRequest
Browse files Browse the repository at this point in the history
ClientRequest will now emit an abort event the first time abort()
is called.

Semver: Minor
Fixes: nodejs/node-v0.x-archive#9278
PR-URL: #945
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com>
  • Loading branch information
evanlucas authored and cjihrig committed Feb 25, 2015
1 parent 89e133a commit 2ca22aa
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 0 deletions.
7 changes: 7 additions & 0 deletions doc/api/http.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -859,6 +859,13 @@ Emitted when the server sends a '100 Continue' HTTP response, usually because
the request contained 'Expect: 100-continue'. This is an instruction that
the client should send the request body.

### Event: 'abort'

`function () { }`

Emitted when the request has been aborted by the client. This event is only
emitted on the first call to `abort()`.

This comment has been minimized.

Copy link
@rvagg

rvagg Feb 26, 2015

Member

@evanlucas this seems mixed to me - aborted by the client yet call to abort()? are we saying that abort() is only ever called as a result of an internal abort by the client?

This comment has been minimized.

Copy link
@evanlucas

evanlucas Feb 26, 2015

Author Contributor

It could probably use clarification. The abort event is emitted the first time abort() is called


### request.flush()

Flush the request headers.
Expand Down
6 changes: 6 additions & 0 deletions lib/_http_client.js
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,12 @@ ClientRequest.prototype._implicitHeader = function() {
};

ClientRequest.prototype.abort = function() {
var self = this;
if (this.aborted === undefined) {
process.nextTick(function() {
self.emit('abort');
});
}
// Mark as aborting so we can avoid sending queued request data
// This is used as a truthy flag elsewhere. The use of Date.now is for
// debugging purposes only.
Expand Down
28 changes: 28 additions & 0 deletions test/parallel/test-http-client-abort-event.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
var assert = require('assert');
var http = require('http');
var common = require('../common');
var server = http.createServer(function(req, res) {
res.end();
});
var count = 0;
server.listen(common.PORT, function() {
var req = http.request({
port: common.PORT
}, function() {
assert(false, 'should not receive data');
});

req.on('abort', function() {
// should only be emitted once
count++;
server.close();
});

req.end();
req.abort();
req.abort();
});

process.on('exit', function() {
assert.equal(count, 1);
})

0 comments on commit 2ca22aa

Please sign in to comment.