Fixes to reading input

kriszyp · Jan 12, 2010 · 62989a2 · 62989a2
1 parent b5e4dec
commit 62989a2
Showing 1 changed file with 23 additions and 22 deletions.
diff --git a/lib/jsgi-node.js b/lib/jsgi-node.js
@@ -91,27 +91,28 @@ function Input( request ) {
     });
 
   this.read = function( length ) {
-    if ( !length ) {
-      if ( !requestCompletePromise._hasFired ) {
-        requestCompletePromise.wait();
-      }
-    }
-
-    else if ( length > inputLength ) {
-      waitingForLength = length;
-      inputPromise = new process.Promise();
-      inputPromise.wait();
-      waitingForLength = Infinity;
-    }
-
-    var chunk = inputBuffer.join("");
-    var keepInBuffer = length ? chunk.substring( length ) : "";
-
-    inputBuffer = [ keepInBuffer ];
-    inputLength = keepInBuffer.length;
-
     return {
-      decodeToString: function() {
+      decodeToString: function( encoding ) {
+        request.setBodyEncoding( encoding );
+        if ( !length ) {
+          if ( !requestCompletePromise.hasFired ) {
+            requestCompletePromise.wait();
+          }
+        }
+
+        else if ( length > inputLength ) {
+          waitingForLength = length;
+          inputPromise = new process.Promise();
+          inputPromise.wait();
+          waitingForLength = Infinity;
+        }
+
+        var chunk = inputBuffer.join("");
+        var keepInBuffer = length ? chunk.substring( length ) : "";
+
+        inputBuffer = [ keepInBuffer ];
+        inputLength = keepInBuffer.length;
+
         return length ? chunk.substring( 0, length ) : chunk;
       }
     };
@@ -149,8 +150,8 @@ function Response( response ) {
         throw new Error("The body does not have a forEach function");
       }
 
-      forEachResult = data.body.forEach( function( chunk ) {
-        response.sendBody( chunk );
+      forEachResult = data.body.forEach( function( chunk, encoding ) {
+        response.sendBody( chunk, encoding );
       });
 
       if ( !notDone && forEachResult && ( typeof forEachResult.then === "function" ) ) {