diff options
| author | isaacs <i@izs.me> | 2012-05-15 22:37:34 +0400 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-05-15 22:37:34 +0400 |
| commit | 5164ae38380dadce74e8f64d7bd3eaa1935dd101 (patch) | |
| tree | fa29fd7bcac679e69b1e9d7eff299aa38f9288a7 /src/pipe_wrap.cc | |
| parent | 01103d077bce626a332be998813382d15bed3501 (diff) | |
| parent | f19f980724fa07347a0d0a9d92e48b267555da5d (diff) | |
Merge remote-tracking branch 'ry/v0.6' into v0.6-merge
Conflicts:
ChangeLog
deps/uv/include/uv-private/uv-unix.h
deps/uv/src/unix/core.c
deps/uv/src/unix/sunos.c
deps/v8/src/runtime.cc
doc/api/crypto.markdown
lib/http.js
src/node_version.h
test/gc/test-http-client-timeout.js
wscript
Diffstat (limited to 'src/pipe_wrap.cc')
| -rw-r--r-- | src/pipe_wrap.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pipe_wrap.cc b/src/pipe_wrap.cc index 023a009196a..f984d3bb3f4 100644 --- a/src/pipe_wrap.cc +++ b/src/pipe_wrap.cc @@ -205,8 +205,8 @@ void PipeWrap::OnConnection(uv_stream_t* handle, int status) { assert(wrap->object_.IsEmpty() == false); if (status != 0) { - // TODO Handle server error (set errno and call onconnection with NULL) - assert(0); + SetErrno(uv_last_error(uv_default_loop())); + MakeCallback(wrap->object_, "onconnection", 0, NULL); return; } |