Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

net: fix large file downloads failing

Fixes #2678.
  • Loading branch information...
commit 0f0af55a0aadf3ca1a960de1b6072f6f4175434e 1 parent 11d1eca
Koichi Kobayashi koichik authored
Showing with 61 additions and 1 deletion.
  1. +1 −1  lib/net.js
  2. +60 −0 test/simple/test-net-write-slow.js
2  lib/net.js
View
@@ -481,7 +481,7 @@ function afterWrite(status, handle, req, buffer) {
return;
}
- timers.active(this);
+ timers.active(self);
self._pendingWriteReqs--;
60 test/simple/test-net-write-slow.js
View
@@ -0,0 +1,60 @@
+// 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 net = require('net');
+
+var SIZE = 1E5;
+var N = 10;
+var received = 0;
+var buf = new Buffer(SIZE);
+buf.fill(0x61); // 'a'
+
+var server = net.createServer(function(socket) {
+ socket.setNoDelay();
+ socket.setTimeout(500);
+ socket.on('timeout', function() {
+ assert.fail();
+ });
+
+ for (var i = 0; i < N; ++i) {
+ socket.write(buf);
+ }
+ socket.end();
+
+}).listen(common.PORT, function() {
+ var conn = net.connect(common.PORT);
+ conn.on('data', function(buf) {
+ received += buf.length;
+ conn.pause();
+ setTimeout(function() {
+ conn.resume();
+ }, 50);
+ });
+ conn.on('end', function() {
+ server.close();
+ });
+});
+
+process.on('exit', function() {
+ assert.equal(received, SIZE * N);
+});

6 comments on commit 0f0af55

Ben Noordhuis

@koichik: The test seems to be timing sensitive. It regularly fails for me:

$ python tools/test.py --mode=debug,release simple/test-net-write-slow
=== release test-net-write-slow ===                    
Path: simple/test-net-write-slow
timers.js:96
            if (!process.listeners('uncaughtException').length) throw e;
                                                                      ^
AssertionError: "undefined"  "undefined"
    at Socket.<anonymous> (/home/bnoordhuis/src/nodejs/v0.6/test/simple/test-net-write-slow.js:36:12)
    at Socket.emit (events.js:64:17)
    at Socket._onTimeout (net.js:152:8)
    at Timer.ontimeout (timers.js:94:19)
Command: out/Release/node /home/bnoordhuis/src/nodejs/v0.6/test/simple/test-net-write-slow.js
[00:03|% 100|+   1|-   1]: Done                       
Koichi Kobayashi
Owner

@bnoordhuis - It does not fail in my environment (Ubuntu). I am investigating...

Ben Noordhuis

FWIW, if I bump the socket timeout from 500 to 550 ms, the test passes in release and debug mode.

Koichi Kobayashi
Owner

@bnoordhuis - Sorry for the delay, can you please confirm koichik/node@2f759a7?

Ben Noordhuis

koichik/node@2f759a7 works reliably, good job.

Koichi Kobayashi
Owner

@bnoordhuis - Thanks! Merged in 2f759a7.

Please sign in to comment.
Something went wrong with that request. Please try again.