diff --git a/AUTHORS b/AUTHORS index 6378303907..1eb73d6df8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -172,4 +172,20 @@ Scott McWhirter Jakub Lekstan Tim Baumann Robert Mustacchi - +George Miroshnykov +Marcel Laverdet +Alexandre Marangone +Mark Cavage +Ryan Petrello +Siddharth Mahendraker +Mathias Buus +Yoshihiro KIKUCHI +Brett Kiefer +Mariano Iglesias +Jörn Horstmann +Joe Shaw +Alex Xu +Kip Gebhardt +Stefan Rusu +Wojciech Wnętrzak +Reid Burke diff --git a/ChangeLog b/ChangeLog index ee02d8027a..a68e1dbef0 100644 --- a/ChangeLog +++ b/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 diff --git a/doc/api/http.markdown b/doc/api/http.markdown index 7af538513c..cb57135070 100644 --- a/doc/api/http.markdown +++ b/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 diff --git a/doc/index.html b/doc/index.html index c6ad3c13d6..4e3fc5c774 100644 --- a/doc/index.html +++ b/doc/index.html @@ -26,7 +26,7 @@
  • Download
  • ChangeLog
  • About
    • -
  • v0.4.9 docs
    • +
  • v0.4.10 docs
  • v0.5.1 docs

  • Wiki
    • @@ -110,10 +110,10 @@ server.listen(1337, "127.0.0.1"); git repo

    -

    2011.06.29 v0.4.9 (stable) +

    2011.07.19 v0.4.10 (stable)

    2011.07.14 v0.5.1 (unstable) diff --git a/lib/http.js b/lib/http.js index a0297142c5..e7e28e816c 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 + diff --git a/test/simple/test-http-head-response-has-no-body-end.js b/test/simple/test-http-head-response-has-no-body-end.js new file mode 100644 index 0000000000..ed91394ce2 --- /dev/null +++ b/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); +});