Merge branch 'v0.6.15-release' into v0.6

ChangeLog

@@ -1,4 +1,27 @@
-2012.03.22 Version 0.6.14 (stable)
+2012.04.09 Version 0.6.15 (stable)
+
+* Update npm to 1.1.16
+
+* Show licenses in binary installers.
+
+* unix: add uv_fs_read64, uv_fs_write64 and uv_fs_ftruncate64 (Ben Noordhuis)
+
+* add 64bit offset fs functions (Igor Zinkovsky)
+
+* windows: don't report ENOTSOCK when attempting to bind an udp handle twice (Bert Belder)
+
+* windows: backport pipe-connect-to-file fixes from master (Bert Belder)
+
+* windows: never call fs event callbacks after closing the watcher (Bert Belder)
+
+* fs.readFile: don't make the callback before the fd is closed (Bert Belder)
+
+* windows: use 64bit offsets for uv_fs apis (Igor Zinkovsky)
+
+* Fix #2061: segmentation fault on OS X due to stat size mismatch (Ben Noordhuis)
+
+
+2012.03.22 Version 0.6.14 (stable), e513ffef7549a56a5af728e1f0c2c0c8f290518a
 
 * net: don't crash when queued write fails (Igor Zinkovsky)
 

doc/community/index.html

@@ -146,7 +146,7 @@
                           <br>
                           <a href="http://nodehispano.com">Node Hispano</a> Spanish language community
                           <br>
-                          <a href="http://nodejskr.org">October Sky JS</a> Korean Node.js community
+                          <a href="http://nodejskr.org">OctoberSkyJs</a> Korea Node.js community
                         </p>
 
                   </div>

lib/fs.js

@@ -1253,7 +1253,8 @@ var WriteStream = fs.WriteStream = function(path, options) {
   this._queue = [];
 
   if (this.fd === null) {
-    this._queue.push([fs.open, this.path, this.flags, this.mode, undefined]);
+    this._open = fs.open;
+    this._queue.push([this._open, this.path, this.flags, this.mode, undefined]);
     this.flush();
   }
 };
@@ -1295,7 +1296,7 @@ WriteStream.prototype.flush = function() {
         cb(null, arguments[1]);
       }
 
-    } else if (method === fs.open) {
+    } else if (method === self._open) {
       // save reference for file pointer
       self.fd = arguments[1];
       self.emit('open', self.fd);
@@ -1313,7 +1314,7 @@ WriteStream.prototype.flush = function() {
   });
 
   // Inject the file pointer
-  if (method !== fs.open) {
+  if (method !== self._open) {
     args.unshift(this.fd);
   }
 

src/node_version.h

@@ -29,7 +29,7 @@
 #define NODE_MAJOR_VERSION 0
 #define NODE_MINOR_VERSION 6
 #define NODE_PATCH_VERSION 15
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)

test/simple/test-fs-write-stream-change-open.js

@@ -0,0 +1,52 @@
+// 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 path = require('path'),
+    fs = require('fs');
+
+var file = path.join(common.tmpDir, 'write.txt');
+
+var stream = fs.WriteStream(file),
+    _fs_close = fs.close,
+    _fs_open = fs.open;
+
+// change the fs.open with an identical function after the WriteStream
+// has pushed it onto its internal action queue, but before it's
+// returned.  This simulates AOP-style extension of the fs lib.
+fs.open = function() {
+  return _fs_open.apply(fs, arguments);
+};
+
+fs.close = function(fd) {
+  assert.ok(fd, 'fs.close must not be called with an undefined fd.');
+  fs.close = _fs_close;
+  fs.open = _fs_open;
+}
+
+stream.write('foo');
+stream.end();
+
+process.on('exit', function() {
+  assert.equal(fs.open, _fs_open);
+});