Merge branch 'master' into fluencydoc_master

# Conflicts:
#	extra/update-version.js
#	server/client.js
#	server/server.js
This commit is contained in:
Louis Lam
2022-04-12 17:44:04 +08:00
140 changed files with 15403 additions and 7817 deletions

View File

@@ -55,7 +55,7 @@ function Ping(host, options) {
this._args = (options.args) ? options.args : [ "-n", "-t", timeout, "-c", "1", host ];
this._regmatch = /=([0-9.]+?) ms/;
} else if (util.FBSD) {
} else if (util.BSD) {
this._bin = "/sbin/ping";
const defaultArgs = [ "-n", "-t", timeout, "-c", "1", host ];