diff options
| -rw-r--r-- | cpukit/libnetworking/ChangeLog | 7 | ||||
| -rw-r--r-- | cpukit/libnetworking/kern/uipc_socket.c | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/cpukit/libnetworking/ChangeLog b/cpukit/libnetworking/ChangeLog index ff0764f11f..5dcc28b4bc 100644 --- a/cpukit/libnetworking/ChangeLog +++ b/cpukit/libnetworking/ChangeLog @@ -1,3 +1,10 @@ +2002-09-14 Joel Sherrill <joel@OARcorp.com> + + * kern/uipc_socket.c: Fix case on SO_RCVTIMEO and SO_SNDTIMEO where + conversion into ticks can result in a 0 ticks timeout which is + the same as requesting no timeout. Reported by Sergei Organov + <osv@javad.ru>. + 2002-09-14 Vyacheslav V. Burdjanadze <wr@zelax.ru> * kern/uipc_mbuf.c, sys/mbuf.h, netinet/udp_usrreq.c: Add diff --git a/cpukit/libnetworking/kern/uipc_socket.c b/cpukit/libnetworking/kern/uipc_socket.c index 49a5a65653..b8671a2a0d 100644 --- a/cpukit/libnetworking/kern/uipc_socket.c +++ b/cpukit/libnetworking/kern/uipc_socket.c @@ -961,6 +961,8 @@ sosetopt(so, level, optname, m0) goto bad; } val = tv->tv_sec * hz + tv->tv_usec / tick; + if (val == 0) + val = 1; switch (optname) { |