Fix up encoding failure

coderoshi · coderoshi · commit 409c869d1d4a · 2013-05-18T22:04:17.000-07:00
diff --git a/lib/fsm.js b/lib/fsm.js
@@ -148,6 +148,7 @@ FSM.prototype.respond = function(req, res, code, headers) {
   }
   res.res.statusCode = code;
   // TODO: write head breaks chunked encoding?
+  // Content-Length
   // res.res.writeHead(code, res.headers);
   if (this.resource.finishRequest != null) {
     this.resource.finishRequest(req, res);
@@ -252,7 +253,7 @@ FSM.prototype.doChooseEncoding = function(provided, encoding) {
     if (match) accepted_encoding = accept;
   }
   // TODO: this is likely wrong
-  if(!accepted_encoding || accepted_encoding === '*') {
+  if(accepted_encoding === '*') {
     accepted_encoding = "identity";
   }
   return accepted_encoding;
diff --git a/test/encoding-test.js b/test/encoding-test.js
@@ -69,8 +69,8 @@ vows.describe('FSM Encoding').addBatch({
       var encoding = fsm.doChooseEncoding(provided, acceptencoding);
       this.callback(true, encoding);
     },
-    'choose identity': function (passed, charset) {
-      assert.equal(charset, 'identity');
+    'choose null': function (passed, charset) {
+      assert.equal(charset, null);
     }
   }
   // check that * works against a lower q match
diff --git a/test/fsm-test.js b/test/fsm-test.js
@@ -89,6 +89,8 @@ function buildTest(test) {
       assert.notEqual(req, undefined, 'req is required');
       // TODO: Use path
       // TODO: Check headers
+      if(res.statusCode() != test.checkStatus)
+        console.log(res.trace);
       assert.equal(res.statusCode(), test.checkStatus);
       assert.deepEqual(res.trace, test.checkStack);
     }

Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,7 @@ FSM.prototype.respond = function(req, res, code, headers) {`
`148`	`148`	`}`
`149`	`149`	`res.res.statusCode = code;`
`150`	`150`	`// TODO: write head breaks chunked encoding?`
	`151`	`+ // Content-Length`
`151`	`152`	`// res.res.writeHead(code, res.headers);`
`152`	`153`	`if (this.resource.finishRequest != null) {`
`153`	`154`	`this.resource.finishRequest(req, res);`
`@@ -252,7 +253,7 @@ FSM.prototype.doChooseEncoding = function(provided, encoding) {`
`252`	`253`	`if (match) accepted_encoding = accept;`
`253`	`254`	`}`
`254`	`255`	`// TODO: this is likely wrong`
`255`		`- if(!accepted_encoding \|\| accepted_encoding === '*') {`
	`256`	`+ if(accepted_encoding === '*') {`
`256`	`257`	`accepted_encoding = "identity";`
`257`	`258`	`}`
`258`	`259`	`return accepted_encoding;`
Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,8 @@ vows.describe('FSM Encoding').addBatch({`
`69`	`69`	`var encoding = fsm.doChooseEncoding(provided, acceptencoding);`
`70`	`70`	`this.callback(true, encoding);`
`71`	`71`	`},`
`72`		`- 'choose identity': function (passed, charset) {`
`73`		`- assert.equal(charset, 'identity');`
	`72`	`+ 'choose null': function (passed, charset) {`
	`73`	`+ assert.equal(charset, null);`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`// check that * works against a lower q match`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,8 @@ function buildTest(test) {`
`89`	`89`	`assert.notEqual(req, undefined, 'req is required');`
`90`	`90`	`// TODO: Use path`
`91`	`91`	`// TODO: Check headers`
	`92`	`+ if(res.statusCode() != test.checkStatus)`
	`93`	`+ console.log(res.trace);`
`92`	`94`	`assert.equal(res.statusCode(), test.checkStatus);`
`93`	`95`	`assert.deepEqual(res.trace, test.checkStack);`
`94`	`96`	`}`