From 41339ef767e12cbc1f72dd4038b38f36f09e3a2e Mon Sep 17 00:00:00 2001 From: hidnplayr Date: Tue, 25 Jun 2013 20:11:09 +0000 Subject: [PATCH] Allow SO_NONBLOCK to be set in socket type on socket open (similar to linux) git-svn-id: svn://kolibrios.org@3705 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/network/socket.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/trunk/network/socket.inc b/kernel/trunk/network/socket.inc index 623318113c..7be377f6e0 100644 --- a/kernel/trunk/network/socket.inc +++ b/kernel/trunk/network/socket.inc @@ -300,11 +300,11 @@ SOCKET_open: mov [esp+32], edi ; return socketnumber DEBUGF DEBUG_NETWORK_VERBOSE, "socknum=%u\n", edi -; push edx -; and edx, SO_NONBLOCK -; or [eax + SOCKET.options], SO_NONBLOCK ;edx ; HACK: make all sockets non-blocking untill API and applications are fixed -; pop edx -; and edx, not SO_NONBLOCK + test edx, SO_NONBLOCK + jz @f + or [eax + SOCKET.options], SO_NONBLOCK + and edx, not SO_NONBLOCK + @@: mov [eax + SOCKET.Domain], ecx mov [eax + SOCKET.Type], edx