Merge branch 'v0.4'

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

AUTHORS

@@ -172,4 +172,20 @@ Scott McWhirter <scott.mcwhirter@joyent.com>
 Jakub Lekstan <jakub.lekstan@dreamlab.pl>
 Tim Baumann <tim@timbaumann.info>
 Robert Mustacchi <rm@joyent.com>
-
+George Miroshnykov <george.miroshnykov@gmail.com>
+Marcel Laverdet <marcel@laverdet.com>
+Alexandre Marangone <a.marangone@gmail.com>
+Mark Cavage <mark.cavage@joyent.com>
+Ryan Petrello <lists@ryanpetrello.com>
+Siddharth Mahendraker <siddharth_mahen@hotmail.com>
+Mathias Buus <m@ge.tt>
+Yoshihiro KIKUCHI <yknetg@gmail.com>
+Brett Kiefer <kiefer@gmail.com>
+Mariano Iglesias <mariano@cricava.com>
+Jörn Horstmann <git@jhorstmann.net>
+Joe Shaw <joeshaw@litl.com>
+Alex Xu <alex_y_xu@yahoo.ca>
+Kip Gebhardt <kip.gebhardt@voxer.com>
+Stefan Rusu <saltwaterc@gmail.com>
+Wojciech Wnętrzak <w.wnetrzak@gmail.com>
+Reid Burke <me@reidburke.com>

ChangeLog

@@ -77,6 +77,33 @@
 * DTrace probes: support X-Forwarded-For (Dave Pacheco)
 
 
+2011.07.19, Version 0.4.10 (stable)
+
+* #394 Fix Buffer drops last null character in UTF-8
+
+* #829 Backport r8577 from V8 (Ben Noordhuis)
+
+* #877 Don't wait for HTTP Agent socket pool to establish connections. 
+
+* #915 Find kqueue on FreeBSD correctly (Brett Kiefer) 
+
+* #1085 HTTP: Fix race in abort/dispatch code (Stefan Rusu)
+
+* #1274 debugger improvement (Yoshihiro Kikuchi)
+
+* #1291 Properly respond to HEAD during end(body) hot path (Reid Burke)
+
+* #1304 TLS: Fix race in abort/connection code (Stefan Rusu)
+
+* #1360 Allow _ in url hostnames.
+
+* Revert 37d529f8 - unbreaks debugger command parsing.
+
+* Bring back global execScript
+
+* Doc improvements
+
+
 2011.06.29, Version 0.4.9 (stable)
 
 * Improve documentation

doc/api/http.markdown

@@ -38,10 +38,10 @@ per connection (in the case of keep-alive connections).
 
 ### Event: 'connection'
 
-`function (stream) { }`
+`function (socket) { }`
 
- When a new TCP stream is established. `stream` is an object of type
- `net.Stream`. Usually users will not want to access this event. The
+ When a new TCP stream is established. `socket` is an object of type
+ `net.Socket`. Usually users will not want to access this event. The
  `stream` can also be accessed at `request.connection`.
 
 ### Event: 'close'
@@ -239,7 +239,7 @@ Resumes a paused request.
 
 ### request.connection
 
-The `net.Stream` object associated with the connection.
+The `net.Socket` object associated with the connection.
 
 
 With HTTPS support, use request.connection.verifyPeer() and

doc/index.html

@@ -26,7 +26,7 @@
         <li><a href="#download">Download</a></li>
         <li><a href="https://github.com/joyent/node/wiki/ChangeLog">ChangeLog</a></li>
         <li><a href="#about">About</a></li>
-        <li><a href="http://nodejs.org/docs/v0.4.9/api">v0.4.9 docs</a></li>
+        <li><a href="http://nodejs.org/docs/v0.4.10/api">v0.4.10 docs</a></li>
         <li><a href="http://nodejs.org/docs/v0.5.1/api">v0.5.1 docs</a></li>
         <br/>
         <li><a href="https://github.com/joyent/node/wiki">Wiki</a></li>
@@ -110,10 +110,10 @@ server.listen(1337, "127.0.0.1");
         <a href="http://github.com/joyent/node/tree/master">git repo</a>
       </p>
 
-      <p>2011.06.29 v0.4.9 (stable)
+      <p>2011.07.19 v0.4.10 (stable)
       <ul class="release">
-        <li><a href="http://nodejs.org/dist/node-v0.4.9.tar.gz"><code>node-v0.4.9.tar.gz</code> Source Code</a>
-        <li><a href="http://nodejs.org/docs/v0.4.9/api/index.html">Documentation</a>
+        <li><a href="http://nodejs.org/dist/node-v0.4.10.tar.gz"><code>node-v0.4.10.tar.gz</code> Source Code</a>
+        <li><a href="http://nodejs.org/docs/v0.4.10/api/index.html">Documentation</a>
       </ul>
 
       <p>2011.07.14 v0.5.1 (unstable)

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 +

test/simple/test-http-head-response-has-no-body-end.js

@@ -0,0 +1,55 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+var assert = require('assert');
+
+var http = require('http');
+
+// This test is to make sure that when the HTTP server
+// responds to a HEAD request with data to res.end,
+// it does not send any body.
+
+var server = http.createServer(function(req, res) {
+  res.writeHead(200);
+  res.end('FAIL'); // broken: sends FAIL from hot path.
+});
+server.listen(common.PORT);
+
+var responseComplete = false;
+
+server.addListener('listening', function() {
+  var req = http.createClient(common.PORT).request('HEAD', '/');
+  common.error('req');
+  req.end();
+  req.addListener('response', function(res) {
+    common.error('response');
+    res.addListener('end', function() {
+      common.error('response end');
+      server.close();
+      responseComplete = true;
+    });
+  });
+});
+
+process.addListener('exit', function() {
+  assert.ok(responseComplete);
+});