Merge remote-tracking branch 'ry/v0.6' into master

Conflicts:
	ChangeLog
	deps/uv/src/unix/udp.c
	deps/uv/src/win/fs.c
	deps/uv/src/win/udp.c
	deps/uv/test/test-fs.c
	doc/index.html
	doc/logos/index.html
	doc/template.html
	src/node_version.h

2 files changed, 25 insertions, 28 deletions

diff --git a/src/node.js b/src/node.js
index 8ca0da48d01..4df1e711f88 100644
--- a/src/node.js
+++ b/src/node.js
@@ -297,8 +297,9 @@
     process.__defineGetter__('stdout', function() {
       if (stdout) return stdout;
       stdout = createWritableStdioStream(1);
-      stdout.end = stdout.destroy = stdout.destroySoon = function() {
-        throw new Error('process.stdout cannot be closed');
+      stdout.destroy = stdout.destroySoon = function(er) {
+        er = er || new Error('process.stdout cannot be closed.');
+        stdout.emit('error', er);
       };
       return stdout;
     });
@@ -306,8 +307,9 @@
     process.__defineGetter__('stderr', function() {
       if (stderr) return stderr;
       stderr = createWritableStdioStream(2);
-      stderr.end = stderr.destroy = stderr.destroySoon = function() {
-        throw new Error('process.stderr cannot be closed');
+      stderr.destroy = stderr.destroySoon = function(er) {
+        er = er || new Error('process.stderr cannot be closed.');
+        stderr.emit('error', er);
       };
       return stderr;
     });
diff --git a/src/udp_wrap.cc b/src/udp_wrap.cc
index cab42b3c277..5f4b7eed19c 100644
--- a/src/udp_wrap.cc
+++ b/src/udp_wrap.cc
@@ -95,7 +95,9 @@ public:
   static Handle<Value> AddMembership(const Arguments& args);
   static Handle<Value> DropMembership(const Arguments& args);
   static Handle<Value> SetMulticastTTL(const Arguments& args);
+  static Handle<Value> SetMulticastLoopback(const Arguments& args);
   static Handle<Value> SetBroadcast(const Arguments& args);
+  static Handle<Value> SetTTL(const Arguments& args);
 
 private:
   static inline char* NewSlab(v8::Handle<v8::Object> global, v8::Handle<v8::Object> wrap_obj);
@@ -157,7 +159,9 @@ void UDPWrap::Initialize(Handle<Object> target) {
   NODE_SET_PROTOTYPE_METHOD(t, "addMembership", AddMembership);
   NODE_SET_PROTOTYPE_METHOD(t, "dropMembership", DropMembership);
   NODE_SET_PROTOTYPE_METHOD(t, "setMulticastTTL", SetMulticastTTL);
+  NODE_SET_PROTOTYPE_METHOD(t, "setMulticastLoopback", SetMulticastLoopback);
   NODE_SET_PROTOTYPE_METHOD(t, "setBroadcast", SetBroadcast);
+  NODE_SET_PROTOTYPE_METHOD(t, "setTTL", SetTTL);
 
   target->Set(String::NewSymbol("UDP"),
               Persistent<FunctionTemplate>::New(t)->GetFunction());
@@ -214,20 +218,25 @@ Handle<Value> UDPWrap::Bind6(const Arguments& args) {
   return DoBind(args, AF_INET6);
 }
 
-Handle<Value> UDPWrap::SetBroadcast(const Arguments& args) {
-  HandleScope scope;
-  UNWRAP
 
-  assert(args.Length() == 1);
+#define X(name, fn)                                                           \
+  Handle<Value> UDPWrap::name(const Arguments& args) {                        \
+    HandleScope scope;                                                        \
+    UNWRAP                                                                    \
+    assert(args.Length() == 1);                                               \
+    int flag = args[0]->Int32Value();                                         \
+    int r = fn(&wrap->handle_, flag);                                         \
+    if (r) SetErrno(uv_last_error(uv_default_loop()));                        \
+    return scope.Close(Integer::New(r));                                      \
+  }
 
-  int on = args[0]->Uint32Value();
-  int r = uv_udp_set_broadcast(&wrap->handle_, on);
+X(SetTTL, uv_udp_set_ttl)
+X(SetBroadcast, uv_udp_set_broadcast)
+X(SetMulticastTTL, uv_udp_set_multicast_ttl)
+X(SetMulticastLoopback, uv_udp_set_multicast_loop)
 
-  if (r)
-    SetErrno(uv_last_error(uv_default_loop()));
+#undef X
 
-  return scope.Close(Integer::New(r));
-}
 
 Handle<Value> UDPWrap::SetMembership(const Arguments& args,
                                      uv_membership membership) {
@@ -263,20 +272,6 @@ Handle<Value> UDPWrap::DropMembership(const Arguments& args) {
   return SetMembership(args, UV_LEAVE_GROUP);
 }
 
-Handle<Value> UDPWrap::SetMulticastTTL(const Arguments& args) {
-  HandleScope scope;
-  UNWRAP
-
-  assert(args.Length() == 1);
-
-  int ttl = args[0]->Uint32Value();
-  int r = uv_udp_set_multicast_ttl(&wrap->handle_, ttl);
-
-  if (r)
-    SetErrno(uv_last_error(uv_default_loop()));
-
-  return scope.Close(Integer::New(r));
-}
 
 Handle<Value> UDPWrap::DoSend(const Arguments& args, int family) {
   HandleScope scope;