Merge branch 'master' into commercial
This commit is contained in:
		
						commit
						ab35fdc40e
					
				@ -120,7 +120,7 @@ module.exports.create = function (state) {
 | 
				
			|||||||
    serveAdmin(req, res, finalhandler(req, res));
 | 
					    serveAdmin(req, res, finalhandler(req, res));
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
  state.httpTunnelServer = http.createServer(function (req, res) {
 | 
					  state.httpTunnelServer = http.createServer(function (req, res) {
 | 
				
			||||||
    //res.setHeader('connection', 'close');
 | 
					    res.setHeader('connection', 'close');
 | 
				
			||||||
    if (state.extensions.webadmin) {
 | 
					    if (state.extensions.webadmin) {
 | 
				
			||||||
      state.extensions.webadmin(state, req, res);
 | 
					      state.extensions.webadmin(state, req, res);
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
 | 
				
			|||||||
@ -113,8 +113,6 @@ module.exports.create = function (state) {
 | 
				
			|||||||
      });
 | 
					      });
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    function next() {
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    function logName() {
 | 
					    function logName() {
 | 
				
			||||||
      var result = Object.keys(remotes).map(function (jwtoken) {
 | 
					      var result = Object.keys(remotes).map(function (jwtoken) {
 | 
				
			||||||
        return remotes[jwtoken].deviceId;
 | 
					        return remotes[jwtoken].deviceId;
 | 
				
			||||||
@ -335,6 +333,7 @@ module.exports.create = function (state) {
 | 
				
			|||||||
      return null;
 | 
					      return null;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    function next() {
 | 
				
			||||||
      var commandHandlers = {
 | 
					      var commandHandlers = {
 | 
				
			||||||
        add_token: addToken
 | 
					        add_token: addToken
 | 
				
			||||||
      , auth: addToken
 | 
					      , auth: addToken
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user