1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

http: Use OOP for OutgoingMessage._finish

Browse Source 
Sniffing instanceof a child class in the parent class's method
is Doing It Wrong.
This commit is contained in:
isaacs 2013-05-30 16:08:03 -07:00
parent 49519f1217
commit 831de7cbb9
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/_http_client.js
View File

@ -133,6 +133,12 @@ util.inherits(ClientRequest, OutgoingMessage);
exports.ClientRequest = ClientRequest; exports.ClientRequest = ClientRequest;
ClientRequest.prototype._finish = function() {
DTRACE_HTTP_CLIENT_REQUEST(this, this.connection);
COUNTER_HTTP_CLIENT_REQUEST();
OutgoingMessage.prototype._finish.call(this);
};
ClientRequest.prototype._implicitHeader = function() { ClientRequest.prototype._implicitHeader = function() {
this._storeHeader(this.method + ' ' + this.path + ' HTTP/1.1\r\n', this._storeHeader(this.method + ' ' + this.path + ' HTTP/1.1\r\n',
this._renderHeaders()); this._renderHeaders());

17
lib/_http_outgoing.js
View File

@ -515,25 +515,8 @@ OutgoingMessage.prototype.end = function(data, encoding) {
}; };
var ServerResponse, ClientRequest;
OutgoingMessage.prototype._finish = function() { OutgoingMessage.prototype._finish = function() {
assert(this.connection); assert(this.connection);
if (!ServerResponse)
ServerResponse = require('_http_server').ServerResponse;
if (!ClientRequest)
ClientRequest = require('_http_client').ClientRequest;
if (this instanceof ServerResponse) {
DTRACE_HTTP_SERVER_RESPONSE(this.connection);
COUNTER_HTTP_SERVER_RESPONSE();
} else {
assert(this instanceof ClientRequest);
DTRACE_HTTP_CLIENT_REQUEST(this, this.connection);
COUNTER_HTTP_CLIENT_REQUEST();
}
this.emit('finish'); this.emit('finish');
}; };

7
lib/_http_server.js
View File

@ -111,6 +111,13 @@ function ServerResponse(req) {
} }
util.inherits(ServerResponse, OutgoingMessage); util.inherits(ServerResponse, OutgoingMessage);
ServerResponse.prototype._finish = function() {
DTRACE_HTTP_SERVER_RESPONSE(this.connection);
COUNTER_HTTP_SERVER_RESPONSE();
OutgoingMessage.prototype._finish.call(this);
};
exports.ServerResponse = ServerResponse; exports.ServerResponse = ServerResponse;