upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-25 08:10:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

[MEDIUM] process shutw during connection attempt

Browse source 
It sometimes happens that a connection is aborted at the exact same moment
it establishes. We have to close the socket and not only to shut it down
for writes.

Some corner cases remain. We have to handle the shutr/shutw at the stream
interface and only report the status to the buffer, not the opposite.
This commit is contained in:
Willy Tarreau 2008-11-27 09:25:45 +01:00
parent b38903cf3c
commit 8bfa426cad
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/proto_http.c
View file

@ -1298,7 +1298,7 @@ void process_session(struct task *t, int *next)
}
if (likely((s->rep->cons->state != SI_ST_CLO) ||
(s->req->cons->state != SI_ST_CLO && s->req->cons->state != SI_ST_INI))) {
(s->req->cons->state > SI_ST_INI && s->req->cons->state < SI_ST_CLO))) {
if ((s->fe->options & PR_O_CONTSTATS) && (s->flags & SN_BE_ASSIGNED))
session_process_counters(s);

12
src/stream_sock.c
View file

@ -486,9 +486,6 @@ int stream_sock_write(int fd) {
void stream_sock_shutw(struct stream_interface *si)
{
switch (si->state) {
case SI_ST_INI:
si->state = SI_ST_CLO;
return;
case SI_ST_EST:
if (!(si->ib->flags & BF_SHUTR)) {
EV_FD_CLR(si->fd, DIR_WR);
@ -497,7 +494,11 @@ void stream_sock_shutw(struct stream_interface *si)
}
/* fall through */
case SI_ST_CON:
/* we may have to close a pending connection, and mark the
* response buffer as shutr
*/
fd_delete(si->fd);
buffer_shutr(si->ib);
si->state = SI_ST_DIS;
return;
}
@ -513,11 +514,8 @@ void stream_sock_shutw(struct stream_interface *si)
*/
void stream_sock_shutr(struct stream_interface *si)
{
if (si->state != SI_ST_EST && si->state != SI_ST_CON) {
if (likely(si->state == SI_ST_INI))
si->state = SI_ST_CLO;
if (si->state != SI_ST_EST && si->state != SI_ST_CON)
return;
}
if (si->ob->flags & BF_SHUTW) {
fd_delete(si->fd);