Merge remote-tracking branch 'origin/master' into ide-remove-agpl-2

configs/client-default.js

@@ -113,7 +113,8 @@ module.exports = function(options) {
             debug: debug,
             installPath: options.installPath,
             dashboardUrl: options.dashboardUrl,
-            accountUrl: options.accountUrl
+            accountUrl: options.accountUrl,
+            rejectUnauthorized: options.rejectUnauthorized
         },
         {
             packagePath: "plugins/c9.vfs.client/endpoint",

node_modules/kaefer/package.json

@@ -8,8 +8,8 @@
         "email": "fabian@c9.io"
     }],
     "dependencies": {
-        "engine.io": "~1.5.1",
-        "engine.io-client": "~1.5.1",
+        "engine.io": "~1.6.9",
+        "engine.io-client": "~1.6.9",
         "amd-loader": "*"
     },
     "devDependencies": {

package.json

@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2623",
+    "version": "3.1.2642",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",
@@ -17,8 +17,8 @@
         "debug": "~0.7.4",
         "ejs": "~1.0.0",
         "emmet": "git://github.com/cloud9ide/emmet-core.git#2ff6dc06ad",
-        "engine.io": "1.5.3",
-        "engine.io-client": "1.5.3",
+        "engine.io": "1.6.9",
+        "engine.io-client": "1.6.9",
         "jsonm": "1.0.6",
         "http-error": "~0.0.5",
         "less": "^2.4.0",
@@ -97,7 +97,7 @@
         "c9.ide.installer": "#b2e4ba0a92",
         "c9.ide.language.python": "#15e7ff9a3f",
         "c9.ide.language.go": "#6ce1c7a7ef",
-        "c9.ide.mount": "#6ddfd05db3",
+        "c9.ide.mount": "#3001a633f2",
         "c9.ide.navigate": "#5d5707058c",
         "c9.ide.newresource": "#981a408a7b",
         "c9.ide.openfiles": "#2ae85a9e33",

plugins/c9.vfs.client/vfs_client.js

@@ -240,9 +240,10 @@ define(function(require, exports, module) {
                     path: parsedSocket.path,
                     host: parsedSocket.host,
                     port: parsedSocket.port 
-                        || parsedSocket.protocol == "https:" ? "443" : null,
+                        || (parsedSocket.protocol == "https:" ? "443" : null),
                     secure: parsedSocket.protocol 
-                        ? parsedSocket.protocol == "https:" : true
+                        ? parsedSocket.protocol == "https:" : true,
+                    rejectUnauthorized: options.rejectUnauthorized
                 };
                 callback();
             });
@@ -330,8 +331,10 @@ define(function(require, exports, module) {
         }
         
         function isIdle() {
+            if (!connection || !consumer)
+                return false;
             return !Object.keys(connection.unacked).length &&
-                consumer && !Object.keys(consumer.callbacks || {}).length;
+                !Object.keys(consumer.callbacks || {}).length;
         }
         
         /***** Lifecycle *****/