Merge branch 'master' into commercial

This commit is contained in:
AJ ONeal 2018-06-30 23:10:33 +00:00
commit 16e30124e6
1 changed files with 6 additions and 6 deletions

View File

@ -46,6 +46,12 @@ module.exports.createTcpConnectionHandler = function (state) {
function tryTls() { function tryTls() {
var vhost; var vhost;
if (!servername) {
if (state.debug) { console.log("No SNI was given, so there's nothing we can do here"); }
deferData('httpsInvalid');
return;
}
if (!state.servernames.length) { if (!state.servernames.length) {
console.info("[Setup] https => admin => setup => (needs bogus tls certs to start?)"); console.info("[Setup] https => admin => setup => (needs bogus tls certs to start?)");
deferData('httpsSetupServer'); deferData('httpsSetupServer');
@ -62,12 +68,6 @@ module.exports.createTcpConnectionHandler = function (state) {
console.log("TODO: use www bare redirect"); console.log("TODO: use www bare redirect");
} }
if (!servername) {
if (state.debug) { console.log("No SNI was given, so there's nothing we can do here"); }
deferData('httpsInvalid');
return;
}
function run() { function run() {
var nextDevice = Devices.next(state.deviceLists, servername); var nextDevice = Devices.next(state.deviceLists, servername);
if (!nextDevice) { if (!nextDevice) {