Merge pull request socketio#1655 from ysmood/fix_etag_header

rauchg · rauchg · commit 968e94e42b08 · 2014-06-30T23:32:23.000-07:00
We should use the standard http protocol to handler the etag header
diff --git a/lib/index.js b/lib/index.js
@@ -269,8 +269,9 @@ Server.prototype.attachServe = function(srv){
  */
 
 Server.prototype.serve = function(req, res){
-  if (req.headers.etag) {
-    if (clientVersion == req.headers.etag) {
+  var etag = req.headers['if-none-match'];
+  if (etag) {
+    if (clientVersion == etag) {
       debug('serve client 304');
       res.writeHead(304);
       res.end();
diff --git a/test/socket.io.js b/test/socket.io.js
@@ -161,7 +161,7 @@ describe('socket.io', function(){
         io(srv);
         request(srv)
         .get('/socket.io/socket.io.js')
-        .set('ETag', clientVersion)
+        .set('If-None-Match', clientVersion)
         .end(function(err, res){
           if (err) return done(err);
           expect(res.statusCode).to.be(304);
