Merge branch 'master' of github.com:vivina/node-paperboy

Conflicts: lib/paperboy.js
felixge · Aug 5, 2011 · d4b5eb5 · d4b5eb5
2 parents 221692a + 38d9aef
commit d4b5eb5
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/lib/paperboy.js b/lib/paperboy.js
@@ -11,6 +11,7 @@ exports.filepath = function (webroot, url) {
   fp = path.normalize(path.join(webroot, (url.match(/\/$/)=='/')  ? url+'index.html' : url));
   // Sanitize input, make sure people can't use .. to get above webroot
   if (/\/|\\$/.test(webroot[webroot.length - 1])) webroot += '/';
+
   if (fp.substr(0, webroot.length) != webroot)
     return(['Permission Denied', null]);
   else