浏览代码

Fix http vs https

Jake 10 年之前
父节点
当前提交
a40a3819d8
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      routes/index.js
  2. 2 2
      test/test.js

+ 1 - 1
routes/index.js

@@ -6,7 +6,7 @@ var router = express.Router();
 router.get('/', function(req, res) {
 router.get('/', function(req, res) {
   res.render('index', {
   res.render('index', {
     title: 'Crafatar',
     title: 'Crafatar',
-    domain: "https://" + req.headers.host,
+    domain: req.secure ? "https" : "http" + "://" + req.headers.host,
     config: config
     config: config
   });
   });
 });
 });

+ 2 - 2
test/test.js

@@ -14,8 +14,8 @@ config.http_timeout *= 3;
 // no spam
 // no spam
 logging.log = function(){};
 logging.log = function(){};
 
 
-var uuids = fs.readFileSync('test/uuids.txt').toString().split("\n");
-var usernames = fs.readFileSync('test/usernames.txt').toString().split("\n");
+var uuids = fs.readFileSync('test/uuids.txt').toString().split("\r\n");
+var usernames = fs.readFileSync('test/usernames.txt').toString().split("\r\n");
 // Get a random UUID + username in order to prevent rate limiting
 // Get a random UUID + username in order to prevent rate limiting
 var uuid = uuids[Math.round(Math.random() * (uuids.length - 1))];
 var uuid = uuids[Math.round(Math.random() * (uuids.length - 1))];
 console.log("using uuid '" + uuid + "'");
 console.log("using uuid '" + uuid + "'");