Merge branch 'v0.10.25-release' into v0.10

AUTHORS

@@ -479,3 +479,9 @@ Gabriel Falkenberg <gabriel.falkenberg@gmail.com>
 Kai Groner <kai@gronr.com>
 Gabriel Farrell <g@grrawr.com>
 Nicolas Kaiser <nikai@nikai.net>
+Lev Gimelfarb <lev.gimelfarb@gmail.com>
+Dav Glass <davglass@gmail.com>
+ayanamist <contact@ayanamist.com>
+Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
+Brandon Cheng <bcheng.gt@gmail.com>
+Alexis Campailla <alexis@janeasystems.com>

ChangeLog

@@ -1,4 +1,23 @@
-2013.12.18, Version 0.10.24 (Stable)
+2014.01.23, Version 0.10.25 (Stable)
+
+* uv: Upgrade to v0.10.23
+
+* npm: Upgrade to v1.3.24
+
+* v8: Fix enumeration for objects with lots of properties
+
+* child_process: fix spawn() optional arguments (Sam Roberts)
+
+* cluster: report more errors to workers (Fedor Indutny)
+
+* domains: exit() only affects active domains (Ryan Graham)
+
+* src: OnFatalError handler must abort() (Timothy J Fontaine)
+
+* stream: writes may return false but forget to emit drain (Yang Tianyang)
+
+
+2013.12.18, Version 0.10.24 (Stable), b7fd6bc899ccb629d790c47aee06aba87e535c41
 
 * uv: Upgrade to v0.10.21
 

lib/net.js

@@ -1064,26 +1064,27 @@ function listen(self, address, port, addressType, backlog, fd) {
 
   cluster._getServer(self, address, port, addressType, fd, function(handle,
                                                                     err) {
-    // EACCESS and friends
-    if (err) {
-      self.emit('error', errnoException(err, 'bind'));
-      return;
-    }
-
-    // Some operating systems (notably OS X and Solaris) don't report EADDRINUSE
-    // errors right away. libuv mimics that behavior for the sake of platform
-    // consistency but that means we have have a socket on our hands that is
-    // not actually bound. That's why we check if the actual port matches what
-    // we requested and if not, raise an error. The exception is when port == 0
-    // because that means "any random port".
-    if (port && handle.getsockname && port != handle.getsockname().port) {
-      self.emit('error', errnoException('EADDRINUSE', 'bind'));
-      return;
-    }
-
-    self._handle = handle;
-    self._listen2(address, port, addressType, backlog, fd);
-  });
+        // EACCESS and friends
+        if (err) {
+          self.emit('error', errnoException(err, 'bind'));
+          return;
+        }
+
+        // Some operating systems (notably OS X and Solaris) don't report
+        // EADDRINUSE errors right away. libuv mimics that behavior for the
+        // sake of platform consistency but that means we have have a socket on
+        // our hands that is not actually bound. That's why we check if the
+        // actual port matches what we requested and if not, raise an error.
+        // The exception is when port == 0 because that means "any random
+        // port".
+        if (port && handle.getsockname && port != handle.getsockname().port) {
+          self.emit('error', errnoException('EADDRINUSE', 'bind'));
+          return;
+        }
+
+        self._handle = handle;
+        self._listen2(address, port, addressType, backlog, fd);
+      });
 }
 
 

src/node_version.h

@@ -26,7 +26,7 @@
 #define NODE_MINOR_VERSION 10
 #define NODE_PATCH_VERSION 25
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_TAG
 # define NODE_TAG ""