Merge branch 'master' of github.com:driverdan/node-XMLHttpRequest

Conflicts:
	package.json

Author: driverdan

lib/XMLHttpRequest.js

@@ -207,6 +207,8 @@ exports.XMLHttpRequest = function() {
   this.getResponseHeader = function(header) {
     if (typeof header === "string"
       && this.readyState > this.OPENED
+      && response
+      && response.headers
       && response.headers[header.toLowerCase()]
       && !errorFlag
     ) {
@@ -385,7 +387,7 @@ exports.XMLHttpRequest = function() {
         response = resp;
         // Check for redirect
         // @TODO Prevent looped redirects
-        if (response.statusCode === 302 || response.statusCode === 303 || response.statusCode === 307) {
+        if (response.statusCode === 301 || response.statusCode === 302 || response.statusCode === 303 || response.statusCode === 307) {
           // Change URL to the redirect location
           settings.url = response.headers.location;
           var url = Url.parse(settings.url);
@@ -479,7 +481,7 @@ exports.XMLHttpRequest = function() {
         + "fs.writeFileSync('" + contentFile + "', 'NODE-XMLHTTPREQUEST-ERROR:' + JSON.stringify(error), 'utf8');"
         + "fs.unlinkSync('" + syncFile + "');"
         + "});"
-        + (data ? "req.write('" + data.replace(/'/g, "\\'") + "');":"")
+        + (data ? "req.write('" + JSON.stringify(data).slice(1,-1).replace(/'/g, "\\'") + "');":"")
         + "req.end();";
       // Start the other Node Process, executing this string
       var syncProc = spawn(process.argv[0], ["-e", execString]);
@@ -498,7 +500,7 @@ exports.XMLHttpRequest = function() {
         self.handleError(errorObj);
       } else {
         // If the file returned okay, parse its data and move to the DONE state
-        self.status = self.responseText.replace(/^NODE-XMLHTTPREQUEST-STATUS:([0-9]*),.*/, "$1");
+        self.status = parseInt(self.responseText.replace(/^NODE-XMLHTTPREQUEST-STATUS:([0-9]*),.*/, "$1"), 10);
         self.responseText = self.responseText.replace(/^NODE-XMLHTTPREQUEST-STATUS:[0-9]*,(.*)/, "$1");
         setState(self.DONE);
       }
@@ -584,7 +586,7 @@ exports.XMLHttpRequest = function() {
    * @param int state New state
    */
   var setState = function(state) {
-    if (self.readyState !== state) {
+    if (state == self.LOADING || self.readyState !== state) {
       self.readyState = state;
 
       if (settings.async || self.readyState < self.OPENED || self.readyState === self.DONE) {

tests/test-redirect-301.js

@@ -0,0 +1,42 @@
+var sys = require("util")
+  , assert = require("assert")
+  , XMLHttpRequest = require("../lib/XMLHttpRequest").XMLHttpRequest
+  , xhr = new XMLHttpRequest()
+  , http = require("http");
+
+// Test server
+var server = http.createServer(function (req, res) {
+  if (req.url === '/redirectingResource') {
+    res.writeHead(301, {'Location': 'http://localhost:8000/'});
+    res.end();
+    return;
+  }
+
+  var body = "Hello World";
+  res.writeHead(200, {
+    "Content-Type": "text/plain",
+    "Content-Length": Buffer.byteLength(body),
+    "Date": "Thu, 30 Aug 2012 18:17:53 GMT",
+    "Connection": "close"
+  });
+  res.write("Hello World");
+  res.end();
+
+  this.close();
+}).listen(8000);
+
+xhr.onreadystatechange = function() {
+  if (this.readyState == 4) {
+    assert.equal(xhr.status, 200);
+    assert.equal(xhr.getRequestHeader('Location'), '');
+    assert.equal(xhr.responseText, "Hello World");
+    sys.puts("done");
+  }
+};
+
+try {
+  xhr.open("GET", "http://localhost:8000/redirectingResource");
+  xhr.send();
+} catch(e) {
+  console.log("ERROR: Exception raised", e);
+}

tests/test-request-protocols.js

@@ -8,7 +8,6 @@ xhr = new XMLHttpRequest();
 xhr.onreadystatechange = function() {
   if (this.readyState == 4) {
     assert.equal("Hello World", this.responseText);
-    this.close();
     runSync();
   }
 };
@@ -25,7 +24,6 @@ var runSync = function() {
   xhr.onreadystatechange = function() {
     if (this.readyState == 4) {
       assert.equal("Hello World", this.responseText);
-      this.close();
       sys.puts("done");
     }
   };

tests/test-streaming.js

@@ -0,0 +1,71 @@
+var sys = require("util")
+  , assert = require("assert")
+  , http = require("http")
+  , XMLHttpRequest = require("../lib/XMLHttpRequest").XMLHttpRequest
+  , xhr;
+
+// Test server
+
+function completeResponse(res,server,body) {
+  res.end();
+  assert.equal(onreadystatechange, true);
+  assert.equal(readystatechange, true);
+  assert.equal(removed, true);
+  assert.equal(loadCount, body.length);
+  sys.puts("done");
+  server.close();
+}
+function push(res,piece) {
+  res.write(piece);
+}
+
+var server = http.createServer(function (req, res) {
+  var body = (req.method != "HEAD" ? ["Hello","World","Stream"] : []);
+
+  res.writeHead(200, {
+    "Content-Type": "text/plain",
+    "Content-Length": Buffer.byteLength(body.join(""))
+  });
+  
+  var nextPiece = 0;
+  var self = this;
+  var interval = setInterval(function() {
+    if (nextPiece < body.length) {
+      res.write(body[nextPiece]);
+      nextPiece++;
+    } else {
+      completeResponse(res,self,body);
+      clearInterval(interval);
+    }
+  },100); //nagle may put writes together, if it happens rise the interval time
+
+}).listen(8000);
+
+xhr = new XMLHttpRequest();
+
+// Track event calls
+var onreadystatechange = false;
+var readystatechange = false;
+var removed = true;
+var loadCount = 0;
+var removedEvent = function() {
+  removed = false;
+};
+
+xhr.onreadystatechange = function() {
+  onreadystatechange = true;
+};
+
+xhr.addEventListener("readystatechange", function() {
+  readystatechange = true;
+  if (xhr.readyState == xhr.LOADING) {
+    loadCount++;
+  }
+});
+
+// This isn't perfect, won't guarantee it was added in the first place
+xhr.addEventListener("readystatechange", removedEvent);
+xhr.removeEventListener("readystatechange", removedEvent);
+
+xhr.open("GET", "http://localhost:8000");
+xhr.send();

tests/testdata.txt

@@ -1 +1 @@
-Hello World
+Hello World