from trunk: removed linger from http server socket; reported by Ilya Martynov

svn:r605
This commit is contained in:
Niels Provos 2007-12-19 06:34:36 +00:00
parent 108ee5f3a6
commit 195455832a
2 changed files with 1 additions and 4 deletions

View File

@ -20,6 +20,7 @@ Changes in current version:
o Correctly handle DNS replies with no answers set (Fixes bug 1846282)
o The configure script now takes an --enable-gcc-warnigns option that turns on many optional gcc warnings. (Nick has been building with these for a while, but they might be useful to other developers.)
o When building with GCC, use the "format" attribute to verify type correctness of calls to printf-like functions.
o removed linger from http server socket; reported by Ilya Martynov
Changes in 1.4.0-beta:

4
http.c
View File

@ -2371,7 +2371,6 @@ name_from_addr(struct sockaddr *sa, socklen_t salen,
static int
bind_socket_ai(struct addrinfo *ai)
{
struct linger linger;
int fd, on = 1, r;
int serrno;
@ -2394,9 +2393,6 @@ bind_socket_ai(struct addrinfo *ai)
setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (void *)&on, sizeof(on));
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void *)&on, sizeof(on));
linger.l_onoff = 1;
linger.l_linger = 5;
setsockopt(fd, SOL_SOCKET, SO_LINGER, (void *)&linger, sizeof(linger));
r = bind(fd, ai->ai_addr, ai->ai_addrlen);
if (r == -1)