Fix reading options from options prototype

Author: dougwilson

HISTORY.md

@@ -1,6 +1,7 @@
 unreleased
 ==========
 
+  * Fix reading options from options prototype
   * deps: [email protected]
   * deps: [email protected]
     - Allow Node.js HTTP server to set `Date` response header

index.js

@@ -14,7 +14,6 @@
  */
 
 var escapeHtml = require('escape-html');
-var merge = require('utils-merge');
 var parseurl = require('parseurl');
 var resolve = require('path').resolve;
 var send = require('send');
@@ -45,32 +44,31 @@ function serveStatic(root, options) {
   }
 
   // copy options object
-  options = merge({}, options)
+  var opts = Object.create(options || null)
 
   // resolve root to absolute
   root = resolve(root)
 
   // default redirect
-  var redirect = options.redirect !== false
+  var redirect = opts.redirect !== false
 
   // headers listener
-  var setHeaders = options.setHeaders
-  delete options.setHeaders
+  var setHeaders = opts.setHeaders
+  opts.setHeaders = undefined
 
   if (setHeaders && typeof setHeaders !== 'function') {
     throw new TypeError('option setHeaders must be function')
   }
 
   // setup options for send
-  options.maxage = options.maxage || options.maxAge || 0
-  options.root = root
+  opts.maxage = opts.maxage || opts.maxAge || 0
+  opts.root = root
 
   return function serveStatic(req, res, next) {
     if (req.method !== 'GET' && req.method !== 'HEAD') {
       return next()
     }
 
-    var opts = merge({}, options)
     var originalUrl = parseurl.original(req)
     var path = parseurl(req).pathname
     var hasTrailingSlash = originalUrl.pathname[originalUrl.pathname.length - 1] === '/'

package.json

@@ -8,8 +8,7 @@
   "dependencies": {
     "escape-html": "1.0.2",
     "parseurl": "~1.3.0",
-    "send": "0.13.0",
-    "utils-merge": "1.0.0"
+    "send": "0.13.0"
   },
   "devDependencies": {
     "istanbul": "0.3.9",