Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "http: make http.ServerResponse emit 'end'"

This reverts commit 790d651.

This makes Duplex streams unworkable, and would only ever be a special
case for HTTP responses, which is not ideal.

Intead, we're going to just bless the 'finish' event for all Writable
streams in 0.10
  • Loading branch information...
commit 836a06fc4f4920d5e9675763290c97aa4e7288fe 1 parent 016afe2
isaacs isaacs authored
11 doc/api/http.markdown
View
@@ -321,17 +321,6 @@ passed as the second parameter to the `'request'` event.
The response implements the [Writable Stream][] interface. This is an
[EventEmitter][] with the following events:
-### Event: 'end'
-
-`function () { }`
-
-Emitted when the response has been sent. More specifically, this event is
-emitted when the last segment of the response headers and body have been
-handed off to the operating system for transmission over the network. It
-does not imply that the client has received anything yet.
-
-After this event, no more events will be emitted on the response object.
-
### Event: 'close'
`function () { }`
4 lib/http.js
View
@@ -840,7 +840,7 @@ OutgoingMessage.prototype._finish = function() {
assert(this instanceof ClientRequest);
DTRACE_HTTP_CLIENT_REQUEST(this, this.connection);
}
- this.emit('end');
+ this.emit('finish');
};
@@ -1780,7 +1780,7 @@ function connectionListener(socket) {
// When we're finished writing the response, check if this is the last
// respose, if so destroy the socket.
- res.on('end', function() {
+ res.on('finish', function() {
// Usually the first incoming element should be our request. it may
// be that in the case abortIncoming() was called that the incoming
// array will be empty.
59 test/simple/test-http-response-end.js
View
@@ -1,59 +0,0 @@
-// 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');
-
-http.createServer(onRequest).listen(common.PORT, onListen);
-
-function onRequest(req, res) {
- var gotEnd = 0;
-
- res.on('close', assert.fail);
-
- res.on('end', function() {
- gotEnd++;
- });
-
- process.on('exit', function() {
- assert.equal(gotEnd, 1);
- });
-
- res.writeHead(200);
- res.end();
- this.close();
-}
-
-function onListen() {
- var req = http.get('http://127.0.0.1:' + common.PORT);
- var gotEnd = 0;
-
- req.on('close', assert.fail);
-
- req.on('end', function() {
- gotEnd++;
- });
-
- process.on('exit', function() {
- assert.equal(gotEnd, 1);
- });
-}
Please sign in to comment.
Something went wrong with that request. Please try again.