Added encoding param to Request#halt() and Request#respond()

Readme.md

@@ -94,7 +94,7 @@ Run individual suites:
     ...
 
 Express is currently being developed with node --version:
-    v0.1.21-19-g3a21e60
+    v0.1.21-66-g59a78d6
 
 ## License 
 

lib/express/request.js

@@ -171,7 +171,7 @@ exports.Request = Class({
   },
 
   /**
-   * Immediately respond with response _code_ and _body_.
+   * Immediately respond with response _code_, _body_ and optional _encoding_.
    * The status _code_ defaults to to 404, and _body_ will
    * default to the default body associated with the response
    * _code_.
@@ -181,33 +181,34 @@ exports.Request = Class({
    *
    * @param  {int} code
    * @param  {string} body
+   * @param  {string} encoding
    * @see statusBodies
    * @api public
    */
 
-  halt: function(code, body) {
+  halt: function(code, body, encoding) {
     this.status(code = code || 404)
     if (body = body || statusBodies[code])
-      return this.respond(body)
+      return this.respond(body, encoding)
     throw new InvalidStatusCode(code)
   },
 
   /**
-   * Respond with _body_.
+   * Respond with _body_ and optional _encoding_.
    *
-   * @param  {Type} Var
-   * @return {Type}
+   * @param  {string} body
+   * @param  {string} encoding
    * @see Request#halt()
    * @api private
    */
 
-  respond: function(body) {
+  respond: function(body, encoding) {
     this.response.body = body
     this.trigger('response')
     if (typeof this.response.body != 'string') throw new InvalidResponseBody(this)
     if (typeof this.response.status != 'number') throw new InvalidStatusCode(this.response.status)
     this.response.sendHeader(this.response.status, this.response.headers)
-    this.response.sendBody(this.response.body)
+    this.response.sendBody(this.response.body, encoding)
     this.response.finish()
   },
 

lib/express/static.js

@@ -48,7 +48,7 @@ exports.File = Class({
         if (!stats.isFile()) request.halt()
         posix.cat(file, 'binary').addCallback(function(content){
           request.contentType(file)
-          request.halt(200, content)
+          request.halt(200, content, 'binary')
         })
       })
     })