Merge branch 'v0.4'

Conflicts:
	ChangeLog
	deps/v8/src/version.cc
	doc/index.html
	src/node_version.h
	test/simple/test-url.js
	wscript

1 files changed, 7 insertions, 0 deletions

diff --git a/lib/http.js b/lib/http.js
index a0297142c5a..e7e28e816c4 100644
--- a/lib/http.js
+++ b/lib/http.js
@@ -652,6 +652,12 @@ OutgoingMessage.prototype.end = function(data, encoding) {
     this._implicitHeader();
   }
 
+  if (data && !this._hasBody) {
+    console.error('This type of response MUST NOT have a body. ' +
+                  'Ignoring data passed to end().');
+    data = false;
+  }
+
   var ret;
 
   var hot = this._headerSent === false &&
@@ -667,6 +673,7 @@ OutgoingMessage.prototype.end = function(data, encoding) {
     //   res.writeHead();
     //   res.end(blah);
     // HACKY.
+
     if (this.chunkedEncoding) {
       var l = Buffer.byteLength(data, encoding).toString(16);
       ret = this.connection.write(this._header + l + CRLF +