From d025a3004d650b7b7ba3baddff9a9ffbb4c43e9f Mon Sep 17 00:00:00 2001
From: jomo <github@jomo.tv>
Date: Mon, 20 Apr 2015 01:10:39 +0200
Subject: [PATCH] remove always-empty first entry in req.url.path_list

rhyme pro :sunglasses:
---
 lib/routes/avatars.js | 2 +-
 lib/routes/renders.js | 4 ++--
 lib/routes/skins.js   | 2 +-
 lib/server.js         | 7 ++++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/routes/avatars.js b/lib/routes/avatars.js
index 36bf6dd..b13b6ed 100644
--- a/lib/routes/avatars.js
+++ b/lib/routes/avatars.js
@@ -26,7 +26,7 @@ function handle_default(img_status, userId, size, def, callback) {
 
 // GET avatar request
 module.exports = function(req, callback) {
-  var userId = (req.url.path_list[2] || "").split(".")[0];
+  var userId = (req.url.path_list[1] || "").split(".")[0];
   var size = parseInt(req.url.query.size) || config.default_size;
   var def = req.url.query.default;
   var helm = req.url.query.hasOwnProperty("helm");
diff --git a/lib/routes/renders.js b/lib/routes/renders.js
index 8d0b6ba..2b7ab26 100644
--- a/lib/routes/renders.js
+++ b/lib/routes/renders.js
@@ -22,7 +22,7 @@ var human_status = {
 // GET render request
 module.exports = function(req, res) {
   var start = new Date();
-  var raw_type = (req.url.path_list[2] || "");
+  var raw_type = (req.url.path_list[1] || "");
   var rid = req.id;
 
   // validate type
@@ -36,7 +36,7 @@ module.exports = function(req, res) {
   }
 
   var body = raw_type === "body";
-  var userId = (req.url.path_list[3] || "").split(".")[0];
+  var userId = (req.url.path_list[2] || "").split(".")[0];
   var def = req.url.query.default;
   var scale = parseInt(req.url.query.scale) || config.default_scale;
   var helm = req.url.query.hasOwnProperty("helm");
diff --git a/lib/routes/skins.js b/lib/routes/skins.js
index 9cb576c..6fd2dec 100644
--- a/lib/routes/skins.js
+++ b/lib/routes/skins.js
@@ -8,7 +8,7 @@ var lwip = require("lwip");
 // GET skin request
 module.exports = function(req, res) {
   var start = new Date();
-  var userId = (req.url.path_list[2] || "").split(".")[0];
+  var userId = (req.url.path_list[1] || "").split(".")[0];
   var def = req.url.query.default;
   var etag = null;
   var rid = req.id;
diff --git a/lib/server.js b/lib/server.js
index 732b785..3594f5e 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -46,14 +46,14 @@ function request_id() {
 function path_list(pathname) {
   // remove trailing and double slashes + other junk
 
-  // FIXME: also accepts relative paths?
-
   pathname = path.resolve(pathname);
   var list = pathname.split("/");
+  list.shift();
   for (var i = 0; i < list.length; i++) {
     // URL decode
     list[i] = querystring.unescape(list[i]);
   }
+  logging.debug("path:", list);
   return list;
 }
 
@@ -65,8 +65,9 @@ function requestHandler(req, res) {
   req.id = request_id();
   req.start = Date.now();
 
-  var local_path = req.url.path_list[1];
+  var local_path = req.url.path_list[0];
   logging.log(req.id, req.method, req.url.href);
+  logging.debug(req.id, req.url.path_list);
   if (req.method === "GET" || req.method === "HEAD") {
     try {
       switch (local_path) {