Permalink
Browse files

tls: fix https with fs.openReadStream hangs

Fixes #2185.
Fixes #2198.
  • Loading branch information...
1 parent 3a16064 commit a28a897107602c8db1947eebbe7aaf5df42d43d0 @koichik committed Nov 26, 2011
Showing with 101 additions and 2 deletions.
  1. +8 −2 lib/tls.js
  2. +93 −0 test/simple/test-https-drain.js
View
@@ -454,8 +454,14 @@ CryptoStream.prototype._pull = function() {
paused = this.pair.cleartext._paused;
}
if (!paused) {
- debug('drain');
- process.nextTick(this.emit.bind(this, 'drain'));
+ debug('drain ' + (this === this.pair.cleartext ? 'clear' : 'encrypted'));
+ var self = this;
+ process.nextTick(function() {
+ if (typeof self.ondrain === 'function') {
+ self.ondrain();
+ }
+ self.emit('drain');
+ });
this._needDrain = false;
if (this.__destroyOnDrain) this.end();
}
@@ -0,0 +1,93 @@
+// 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.
+
+if (!process.versions.openssl) {
+ console.error('Skipping because node compiled without OpenSSL.');
+ process.exit(0);
+}
+
+var common = require('../common');
+var assert = require('assert');
+var https = require('https');
+var fs = require('fs');
+var path = require('path');
+
+var options = {
+ key: fs.readFileSync(path.join(common.fixturesDir, 'test_key.pem')),
+ cert: fs.readFileSync(path.join(common.fixturesDir, 'test_cert.pem'))
+};
+
+var bufSize = 1024 * 1024;
+var sent = 0;
+var received = 0;
+
+var server = https.createServer(options, function(req, res) {
+ res.writeHead(200);
+ req.pipe(res);
+});
+
+server.listen(common.PORT, function() {
+ var resumed = false;
+ var req = https.request({
+ port: common.PORT,
+ method: 'POST'
+ }, function(res) {
+ var timer;
+ res.pause();
+ common.debug('paused');
+ send();
+ function send() {
+ if (req.write(new Buffer(bufSize))) {
+ sent += bufSize;
+ assert.ok(sent < 100 * 1024 * 1024); // max 100MB
+ return process.nextTick(send);
+ }
+ sent += bufSize;
+ common.debug('sent: ' + sent);
+ resumed = true;
+ res.resume();
+ common.debug('resumed');
+ timer = setTimeout(function() {
+ process.exit(1);
+ }, 1000);
+ }
+
+ res.on('data', function(data) {
+ assert.ok(resumed);
+ if (timer) {
+ clearTimeout(timer);
+ timer = null;
+ }
+ received += data.length;
+ if (received >= sent) {
+ common.debug('received: ' + received);
+ req.end();
+ server.close();
+ }
+ });
+ });
+ req.write('a');
+ ++sent;
+});
+
+process.on('exit', function() {
+ assert.equal(sent, received);
+});

0 comments on commit a28a897

Please sign in to comment.