Merge remote branch 'aheckmann/staticbuffersize'

expressjs · Jun 10, 2010 · 66c6152 · 66c6152
2 parents 497a284 + 32cd51d
commit 66c6152
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/lib/express/plugins/static.js b/lib/express/plugins/static.js
@@ -55,6 +55,8 @@ exports.Static = Plugin.extend({
           if (options instanceof Function)
             callback = options,
             options = {}
+          else
+            options = options || {}
           if (path.indexOf('..') !== -1)
             Error.raise('InvalidPathError', "`" + path + "' is not a valid path")
           fs.stat(path, function(err, stat){
@@ -68,7 +70,16 @@ exports.Static = Plugin.extend({
               return self.respond(304, null)
             self.header('Content-Length', stat.size)
             self.header('ETag', etag)
-            self.stream(fs.createReadStream(path, options))
+            options.bufferSize = options.bufferSize
+                              || set('static buffer size')
+                              || 65536
+            if (stat.size > options.bufferSize)
+              return self.stream(fs.createReadStream(path, options))
+            fs.readFile(path, function(err, content){
+              if (err) return self.error(err, callback)
+              self.contentType(path)
+              self.respond(200, content)
+            })
           })
           return this
         },