diff --git a/package-lock.json b/package-lock.json index d108a7d6..58d6c225 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1432,6 +1432,11 @@ "sshpk": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz" } }, + "http2": { + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/http2/-/http2-3.3.7.tgz", + "integrity": "sha512-puSi8M8WNlFJm9Pk4c/Mbz9Gwparuj3gO9/RRO5zv6piQ0FY+9Qywp0PdWshYgsMJSalixFY7eC6oPu0zRxLAQ==" + }, "iconv-lite": { "version": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", "integrity": "sha1-90aPYBNfXl2tM5nAqBvpoWA6CCs=" diff --git a/package.json b/package.json index 686e03fb..01b9997c 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "gulp-concat": "^2.6.1", "gulp-uglifyjs": "^0.6.2", "gulp-util": "^3.0.8", + "http2": "^3.3.7", "jimp": "^0.2.28", "mobile-detect": "^1.3.7", "mongodb": "^2.0.27", diff --git a/server/app.js b/server/app.js index 611dc126..a562f80d 100644 --- a/server/app.js +++ b/server/app.js @@ -78,10 +78,10 @@ function startSingle(clustered, redis_enabled) { ca: ca }; var https = require('https'); - server = https.Server(credentials, routingFunction); + server = require('http2').createServer(credentials, routingFunction); } catch(err){ console.log("Starting without https (probably on localhost)"); - server = http.createServer(routingFunction); + server = require('http2').createServer(routingFunction); } if(clustered) { diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js index fd9338b6..d9d0cbd7 100755 --- a/server/public/assets/js/listeners.js +++ b/server/public/assets/js/listeners.js @@ -146,6 +146,7 @@ if(!Helper.mobilecheck()) { window.onerror = function(e) { if(e == "Script error.") return true; Helper.logs.unshift({log: e.toString().replace(/(\r\n|\n|\r)/gm,""), date: new Date()}); + Helper.logs.unshift({log: chan.toLowerCase(), date: new Date()}); $(".contact-form-content").remove(); $("#submit-contact-form").remove(); $(".contact-modal-header").text("An error occurred");