Merge branch 'master' into commercial

This commit is contained in:
AJ ONeal 2018-06-07 01:39:27 +00:00
commit ab35fdc40e
2 changed files with 196 additions and 197 deletions

View File

@ -120,7 +120,7 @@ module.exports.create = function (state) {
serveAdmin(req, res, finalhandler(req, res));
};
state.httpTunnelServer = http.createServer(function (req, res) {
//res.setHeader('connection', 'close');
res.setHeader('connection', 'close');
if (state.extensions.webadmin) {
state.extensions.webadmin(state, req, res);
} else {

View File

@ -113,8 +113,6 @@ module.exports.create = function (state) {
});
}
function next() {
function logName() {
var result = Object.keys(remotes).map(function (jwtoken) {
return remotes[jwtoken].deviceId;
@ -335,6 +333,7 @@ module.exports.create = function (state) {
return null;
}
function next() {
var commandHandlers = {
add_token: addToken
, auth: addToken