azures04/crafatar
1
0
Fork 0
mirror of https://github.com/azures04/crafatar.git synced 2026-03-21 23:41:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

solve merge conflict

Browse Source
This commit is contained in:
jomo 2015-01-06 20:45:18 +01:00
commit 58b7995d53
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server.js
View File

@ -20,18 +20,8 @@ function asset_request(req, res) {
var filename = __dirname + "/public/" + req.url.path_list.join("/"); var filename = __dirname + "/public/" + req.url.path_list.join("/");
fs.exists(filename, function(exists) { fs.exists(filename, function(exists) {
if (exists) { if (exists) {
fs.readFile(filename, function(err, file_buffer) { res.writeHead(200, { "Content-type" : mime.lookup(filename) });
if (err) { fs.createReadStream(filename).pipe(res);
res.writeHead(500, {"Content-type" : "text/plain"});
res.end("Internal Server Error");
} else {
res.writeHead(200, {
"Content-type" : mime.lookup(filename),
"Content-Length": file_buffer.length
});
res.end(file_buffer);
}
});
} else { } else {
res.writeHead(404, { res.writeHead(404, {
"Content-type" : "text/plain" "Content-type" : "text/plain"
@ -42,10 +32,8 @@ function asset_request(req, res) {
} }
function requestHandler(req, res) { function requestHandler(req, res) {
var query = url.parse(req.url).query;
var request = req; var request = req;
// we need to use url.parse and give the result to url.parse because nodejs request.url = url.parse(req.url, true);
request.url = url.parse(req.url, query);
request.url.query = request.url.query || {}; request.url.query = request.url.query || {};
// remove trailing and double slashes + other junk // remove trailing and double slashes + other junk
@ -101,4 +89,4 @@ if (require.main === module) {
// cleaning worker // cleaning worker
setInterval(clean.run, config.cleaning_interval * 1000); setInterval(clean.run, config.cleaning_interval * 1000);
} }