Merge c308a0a into 31c6a5e

index.js

@@ -83,7 +83,14 @@ function send(ctx, path, opts) {
     ctx.set('Content-Length', stats.size);
     ctx.set('Cache-Control', 'max-age=' + (maxage / 1000 | 0));
     ctx.type = type(path);
-    ctx.body = fs.createReadStream(path);
+
+    // if fresh, 304
+    ctx.status = 200;
+    if (ctx.fresh) {
+      ctx.status = 304;
+    } else {
+      ctx.body = fs.createReadStream(path);
+    }
 
     return path;
   }

test/index.js

@@ -310,6 +310,24 @@ describe('send(ctx, file)', function(){
         .expect(200, done);
       })
     })
+
+    it('should return 304 when fresh',function(done){
+      var app = koa();
+      app.use(function *(){
+        yield send(this, '/test/fixtures/user.json');
+      });
+      app = app.callback();
+
+      request(app)
+      .get('/')
+      .expect(200)
+      .end(function(err,res){
+        request(app)
+        .get('/')
+        .set('if-modified-since',res.headers['last-modified'])
+        .expect(304, done);
+      })
+    })
   })
 
   it('should set the Content-Type', function(done){