cherry-pick changes from 5.x core

Author: DonutEspresso

lib/plugins/static.js

@@ -44,8 +44,7 @@ function serveStatic(options) {
 
     function serveFileFromStats(file, err, stats, isGzip, req, res, next) {
         if (err) {
-            next(new ResourceNotFoundError(err,
-                req.path()));
+            next(new ResourceNotFoundError(err, '%s', req.path()));
             return;
         } else if (!stats.isFile()) {
             next(new ResourceNotFoundError('%s does not exist', req.path()));
@@ -125,12 +124,12 @@ function serveStatic(options) {
         }
 
         if (!re.test(file.replace(/\\/g, '/'))) {
-            next(new NotAuthorizedError(req.path()));
+            next(new NotAuthorizedError('%s', req.path()));
             return;
         }
 
         if (opts.match && !opts.match.test(file)) {
-            next(new NotAuthorizedError(req.path()));
+            next(new NotAuthorizedError('%s', req.path()));
             return;
         }
 

package.json

@@ -13,6 +13,7 @@
     "Ben Hale",
     "Ben Hutchinson",
     "Benjamine Coe",
+    "Benjamin Urban",
     "Blake VanLandingham",
     "Bryce Kahle",
     "Christopher Cannell",