Commit 7eba9460 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Stop messing with the linger bit, there are too many portability issues

and bugs right now.




git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@4605 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent f7a7c480
......@@ -92,7 +92,7 @@ VCA_waiter_name(void)
* will return immediately.
*/
static const struct linger linger = {
.l_onoff = 1,
.l_onoff = 0,
};
static unsigned char need_sndtimeo, need_rcvtimeo, need_linger, need_test;
......
......@@ -271,7 +271,7 @@ cnt_done(struct sess *sp)
* This is an orderly close of the connection; ditch nolinger
* before we close, to get queued data transmitted.
*/
(void)TCP_linger(sp->fd, 0);
// XXX: not yet (void)TCP_linger(sp->fd, 0);
vca_close_session(sp, sp->doclose);
}
......
......@@ -100,11 +100,11 @@ PipeSession(struct sess *sp)
memset(fds, 0, sizeof fds);
(void)TCP_linger(vc->fd, 0);
// XXX: not yet (void)TCP_linger(vc->fd, 0);
fds[0].fd = vc->fd;
fds[0].events = POLLIN | POLLERR;
(void)TCP_linger(sp->fd, 0);
// XXX: not yet (void)TCP_linger(sp->fd, 0);
fds[1].fd = sp->fd;
fds[1].events = POLLIN | POLLERR;
......
......@@ -197,7 +197,7 @@ vca_main(void *arg)
if (sp->t_open > deadline)
break;
VTAILQ_REMOVE(&sesshead, sp, list);
TCP_linger(sp->fd, 0);
// XXX: not yet TCP_linger(sp->fd, 0);
vca_close_session(sp, "timeout");
SES_Delete(sp);
}
......
......@@ -198,7 +198,7 @@ vca_kqueue_main(void *arg)
if (sp->t_open > deadline)
break;
VTAILQ_REMOVE(&sesshead, sp, list);
(void)TCP_linger(sp->fd, 0);
// XXX: not yet (void)TCP_linger(sp->fd, 0);
vca_close_session(sp, "timeout");
SES_Delete(sp);
}
......
......@@ -166,7 +166,7 @@ vca_main(void *arg)
} else if (sp->t_open <= deadline) {
VTAILQ_REMOVE(&sesshead, sp, list);
vca_unpoll(fd);
(void)TCP_linger(sp->fd, 0);
// XXX: not yet (void)TCP_linger(sp->fd, 0);
vca_close_session(sp, "timeout");
SES_Delete(sp);
}
......
......@@ -139,7 +139,7 @@ vca_main(void *arg)
VTAILQ_REMOVE(&sesshead, sp, list);
if(sp->fd != -1)
vca_del(sp->fd);
TCP_linger(sp->fd, 0);
// XXX: not yet TCP_linger(sp->fd, 0);
vca_close_session(sp, "timeout");
SES_Delete(sp);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment