Merge remote branch 'origin/v0.6'
authorRyan Dahl <ry@tinyclouds.org>
Mon, 16 Jan 2012 23:20:26 +0000 (15:20 -0800)
committerRyan Dahl <ry@tinyclouds.org>
Mon, 16 Jan 2012 23:20:26 +0000 (15:20 -0800)
Conflicts:
deps/uv/src/win/util.c
src/udp_wrap.cc

1  2 
lib/net.js
src/udp_wrap.cc

diff --cc lib/net.js
Simple merge
diff --cc src/udp_wrap.cc
@@@ -365,8 -406,7 +407,7 @@@ void UDPWrap::OnRecv(uv_udp_t* handle
    };
  
    if (nread == -1) {
 -    SetErrno(uv_last_error(uv_default_loop()));
 +    SetErrno(uv_last_error(Loop()));
-     ReleaseMemory(buf.base, NULL);
    }
    else {
      Local<Object> rinfo = Object::New();