diff --git a/app.js b/app.js index ebc3b7826..6ed9fba9c 100644 --- a/app.js +++ b/app.js @@ -12,6 +12,26 @@ app.start = function(port, callback) { app.set('port', port); app.use(express.static(__dirname)); + if (process.env.USE_HTTPS) { + process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = '0'; + var fs = require('fs'); + var path = require('path'); + var bc = path.dirname(require.resolve('bitcore/package.json')); + var server = require('https').createServer({ + key: fs.readFileSync(bc + '/test/data/x509.key'), + cert: fs.readFileSync(bc + '/test/data/x509.crt') + }); + var pserver = require(bc + '/examples/PayPro/server.js'); + server.on('request', function(req, res) { + app(req, res); + pserver.app(res, res); + }); + app.listen(port, function() { + callback('https://localhost:' + port); + }); + return; + } + app.listen(port, function() { callback('http://localhost:' + port); }); diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js index f1e2cca95..21ac51a15 100644 --- a/js/models/core/Wallet.js +++ b/js/models/core/Wallet.js @@ -84,6 +84,12 @@ var $http = G.$http || function $http(options, callback) { // Newer browsers: xhr.responseType = 'arraybuffer'; + xhr.onreadystatechange = function() { + if (xhr.readyState == 4) { + ; + } + }; + xhr.onload = function(event) { var response = xhr.response; var buf = new Uint8Array(response);