Merge remote-tracking branch 'upstream/1.0' into 1.1

Author: pontusmelke

lib/browser/neo4j-web.js

@@ -28272,9 +28272,9 @@ module.exports = exports["default"];
 // Central place to detect feature support for the current platform,
 // expand as needed.
 
-"use strict";
+'use strict';
 
-Object.defineProperty(exports, "__esModule", {
+Object.defineProperty(exports, '__esModule', {
   value: true
 });
 var FEATURES = {
@@ -28283,8 +28283,8 @@ var FEATURES = {
       // This is insane. We are verifying that we have a version of getPeerCertificate
       // that supports reading the whole certificate, eg this commit:
       // https://github.com/nodejs/node/commit/345c40b6
-      var desc = require('tls').TLSSocket.prototype.getPeerCertificate.toString();
-      return desc.startsWith("function getPeerCertificate(detailed)");
+      var desc = require('tls').TLSSocket.prototype.getPeerCertificate;
+      return desc.length() >= 1;
     } catch (e) {
       return false;
     }
@@ -28295,8 +28295,8 @@ function hasFeature(name) {
   return FEATURES[name] && FEATURES[name]();
 }
 
-exports["default"] = hasFeature;
-module.exports = exports["default"];
+exports['default'] = hasFeature;
+module.exports = exports['default'];
 
 },{"tls":43}],152:[function(require,module,exports){
 /**
@@ -28468,17 +28468,27 @@ var Packer = (function () {
       } else if (x instanceof Array) {
         this.packListHeader(x.length);
         for (var i = 0; i < x.length; i++) {
-          this.pack(x[i]);
+          this.pack(x[i] === undefined ? null : x[i]);
         }
       } else if (x instanceof Structure) {
         this.packStruct(x.signature, x.fields);
       } else if (typeof x == "object") {
         var keys = Object.keys(x);
-        this.packMapHeader(keys.length);
+
+        var count = 0;
+        for (var i = 0; i < keys.length; i++) {
+          if (x[keys[i]] !== undefined) {
+            count++;
+          }
+        }
+
+        this.packMapHeader(count);
         for (var i = 0; i < keys.length; i++) {
           var key = keys[i];
-          this.packString(key);
-          this.pack(x[key]);
+          if (x[key] !== undefined) {
+            this.packString(key);
+            this.pack(x[key]);
+          }
         }
       } else {
         throw (0, _error.newError)("Cannot pack this value: " + x);

lib/browser/neo4j-web.min.js

@@ -20,9 +20,9 @@
 // Central place to detect feature support for the current platform,
 // expand as needed.
 
-"use strict";
+'use strict';
 
-Object.defineProperty(exports, "__esModule", {
+Object.defineProperty(exports, '__esModule', {
   value: true
 });
 var FEATURES = {
@@ -31,8 +31,8 @@ var FEATURES = {
       // This is insane. We are verifying that we have a version of getPeerCertificate
       // that supports reading the whole certificate, eg this commit:
       // https://github.com/nodejs/node/commit/345c40b6
-      var desc = require('tls').TLSSocket.prototype.getPeerCertificate.toString();
-      return desc.startsWith("function getPeerCertificate(detailed)");
+      var desc = require('tls').TLSSocket.prototype.getPeerCertificate;
+      return desc.length() >= 1;
     } catch (e) {
       return false;
     }
@@ -43,5 +43,5 @@ function hasFeature(name) {
   return FEATURES[name] && FEATURES[name]();
 }
 
-exports["default"] = hasFeature;
-module.exports = exports["default"];
+exports['default'] = hasFeature;
+module.exports = exports['default'];

lib/browser/neo4j-web.test.js

@@ -135,17 +135,27 @@ var Packer = (function () {
       } else if (x instanceof Array) {
         this.packListHeader(x.length);
         for (var i = 0; i < x.length; i++) {
-          this.pack(x[i]);
+          this.pack(x[i] === undefined ? null : x[i]);
         }
       } else if (x instanceof Structure) {
         this.packStruct(x.signature, x.fields);
       } else if (typeof x == "object") {
         var keys = Object.keys(x);
-        this.packMapHeader(keys.length);
+
+        var count = 0;
+        for (var i = 0; i < keys.length; i++) {
+          if (x[keys[i]] !== undefined) {
+            count++;
+          }
+        }
+
+        this.packMapHeader(count);
         for (var i = 0; i < keys.length; i++) {
           var key = keys[i];
-          this.packString(key);
-          this.pack(x[key]);
+          if (x[key] !== undefined) {
+            this.packString(key);
+            this.pack(x[key]);
+          }
         }
       } else {
         throw (0, _error.newError)("Cannot pack this value: " + x);

lib/v1/internal/features.js

@@ -0,0 +1,38 @@
+
+/**
+ * Copyright (c) 2002-2016 "Neo Technology,"
+ * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var LOCALHOST_MATCHER = /^(localhost|127(\.\d+){3})$/i;
+var ENCRYPTION_ON = "ENCRYPTION_ON";
+var ENCRYPTION_OFF = "ENCRYPTION_OFF";
+var ENCRYPTION_NON_LOCAL = "ENCRYPTION_NON_LOCAL";
+
+function isLocalHost(host) {
+  return LOCALHOST_MATCHER.test(host);
+}
+
+exports.isLocalHost = isLocalHost;
+exports.ENCRYPTION_ON = ENCRYPTION_ON;
+exports.ENCRYPTION_OFF = ENCRYPTION_OFF;
+exports.ENCRYPTION_NON_LOCAL = ENCRYPTION_NON_LOCAL;

lib/v1/internal/packstream.js

@@ -26,8 +26,8 @@ const FEATURES = {
       // This is insane. We are verifying that we have a version of getPeerCertificate
       // that supports reading the whole certificate, eg this commit:
       // https://github.com/nodejs/node/commit/345c40b6
-      let desc = require('tls').TLSSocket.prototype.getPeerCertificate.toString();
-      return desc.startsWith("function getPeerCertificate(detailed)");
+      let desc = require('tls').TLSSocket.prototype.getPeerCertificate;
+      return desc.length() >= 1;
     } catch( e ) {
       return false;
     }