Permalink
Browse files

Merge branch 'master' of https://github.com/crcastle/Squeenote into c…

…rcastle-master
  • Loading branch information...
2 parents c528c89 + 5708a41 commit 6d18cdb8e795ad5bdecda2d4e6688dd5c958be7b @julesfern committed Feb 17, 2011
Showing 966 changed files with 263,823 additions and 2,717 deletions.
@@ -74,8 +74,8 @@ Server = this.Server = Class({
staticFileResponse: function(req, res) {
var request_info = url.parse(req.url);
sys.puts("Serving static file: "+request_info.href);
- if(request_info.href.indexOf("/public") != 0) return denyResponse(req, res, "Static file requested outside of public directory");
- if(request_info.href.indexOf("..") > -1) return denyResponse(req, res, "Illegal static file path");
+ if(request_info.href.indexOf("/public") != 0) return this.denyResponse(req, res, "Static file requested outside of public directory");
+ if(request_info.href.indexOf("..") > -1) return this.denyResponse(req, res, "Illegal static file path");
fs.readFile("."+request_info.href, function(error, data) {
if(error) return this.notFoundResponse(req, res);
res.writeHead(200, {});
@@ -118,7 +118,6 @@ Server = this.Server = Class({
broadcast_response = {};
presenter_authenticated = (message.presenter_password == this.presenter_password);
-
// Sync local state for authenticated messages
if(message.presenter_password != null) {
client_response.authentication_attempted = true;
Binary file not shown.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 6d18cdb

Please sign in to comment.