fix socket-timeout. Also fix makefile test list name net-stream

This commit is contained in:
Henry Rawas
2011-07-12 15:26:45 -07:00
committed by Ben Noordhuis
parent 9057d3f17e
commit 92057554d5
2 changed files with 3 additions and 2 deletions

View File

@@ -140,7 +140,8 @@ test-uv: all
simple/test-net-reconnect \
simple/test-net-remote-address-port \
simple/test-net-server-try-ports \
simple/test-net-server-stream \
simple/test-net-stream \
simple/test-net-socket-timeout \
simple/test-next-tick \
simple/test-next-tick-errors \
simple/test-next-tick-ordering \

View File

@@ -440,7 +440,7 @@ function Server(/* [ options, ] listener */) {
options = {};
self.on('connection', arguments[0]);
} else {
options = arguments[0];
options = arguments[0] || {};
if (typeof arguments[1] == 'function') {
self.on('connection', arguments[1]);