Skip to content

Commit 81fd842

Browse files
committed
http: clean up dead code and unused properties
1 parent 0450ce7 commit 81fd842

File tree

3 files changed

+9
-14
lines changed

3 files changed

+9
-14
lines changed

lib/_http_common.js

-6
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,6 @@ function parserOnMessageComplete() {
126126
parser._url = '';
127127
}
128128

129-
if (!stream.upgrade)
130-
// For upgraded connections, also emit this after parser.execute
131-
stream.push(null);
132-
}
133-
134-
if (stream && !parser.incoming._pendings.length) {
135129
// For emit end event
136130
stream.push(null);
137131
}

lib/_http_incoming.js

+7-3
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ function IncomingMessage(socket) {
3838

3939
this.readable = true;
4040

41-
this._pendings = [];
42-
this._pendingIndex = 0;
4341
this.upgrade = null;
4442

4543
// request (server) only
@@ -49,7 +47,6 @@ function IncomingMessage(socket) {
4947
// response (client) only
5048
this.statusCode = null;
5149
this.statusMessage = null;
52-
this.client = this.socket;
5350

5451
// flag for backwards compatibility grossness.
5552
this._consuming = false;
@@ -63,6 +60,13 @@ util.inherits(IncomingMessage, Stream.Readable);
6360

6461
exports.IncomingMessage = IncomingMessage;
6562

63+
Object.defineProperty(IncomingMessage.prototype, 'client', {
64+
configurable: true,
65+
enumerable: true,
66+
get: util.deprecate(function() {
67+
return this.socket;
68+
}, 'client is deprecated, use socket or connection instead')
69+
});
6670

6771
IncomingMessage.prototype.setTimeout = function(msecs, callback) {
6872
if (callback)

lib/_http_outgoing.js

+2-5
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ function OutgoingMessage() {
6262
this._trailer = '';
6363

6464
this.finished = false;
65-
this._hangupClose = false;
6665
this._headerSent = false;
6766

6867
this.socket = null;
@@ -148,8 +147,7 @@ OutgoingMessage.prototype._writeRaw = function(data, encoding, callback) {
148147
var outputEncodings = this.outputEncodings;
149148
var outputCallbacks = this.outputCallbacks;
150149
for (var i = 0; i < outputLength; i++) {
151-
connection.write(output[i], outputEncodings[i],
152-
outputCallbacks[i]);
150+
connection.write(output[i], outputEncodings[i], outputCallbacks[i]);
153151
}
154152

155153
this.output = [];
@@ -613,8 +611,7 @@ OutgoingMessage.prototype._flush = function() {
613611
var outputEncodings = this.outputEncodings;
614612
var outputCallbacks = this.outputCallbacks;
615613
for (var i = 0; i < outputLength; i++) {
616-
ret = socket.write(output[i], outputEncodings[i],
617-
outputCallbacks[i]);
614+
ret = socket.write(output[i], outputEncodings[i], outputCallbacks[i]);
618615
}
619616

620617
this.output = [];

0 commit comments

Comments
 (0)