summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/http.js2
-rw-r--r--test/simple/test-regress-GH-4948.js50
2 files changed, 51 insertions, 1 deletions
diff --git a/lib/http.js b/lib/http.js
index aafbe5f60f..1f52d31514 100644
--- a/lib/http.js
+++ b/lib/http.js
@@ -420,7 +420,7 @@ IncomingMessage.prototype._dump = function() {
return;
this._dumped = true;
- this.socket.parser.incoming = null;
+ if (this.socket.parser) this.socket.parser.incoming = null;
this.push(null);
readStart(this.socket);
};
diff --git a/test/simple/test-regress-GH-4948.js b/test/simple/test-regress-GH-4948.js
new file mode 100644
index 0000000000..d96c4da613
--- /dev/null
+++ b/test/simple/test-regress-GH-4948.js
@@ -0,0 +1,50 @@
+// 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.
+
+// https://github.com/joyent/node/issues/4948
+
+var common = require('../common');
+var http = require('http');
+
+http.createServer(function(serverReq, serverRes){
+
+ http.request({hostname: 'localhost', port: common.PORT}, function(res) {
+ // required, just needs to be in the client response somewhere
+ serverRes.end();
+
+ // required for test to fail
+ res.on('data', function(data) {});
+ }).end();
+
+ serverRes.write('some data');
+}).listen(common.PORT);
+
+
+// simulate a client request that closes early
+var net = require('net');
+
+var sock = new net.Socket();
+sock.connect(common.PORT, 'localhost');
+
+sock.on('connect', function() {
+ sock.write('GET / HTTP/1.1\r\n\r\n');
+ sock.end();
+});