mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

[MINOR] ensure the termination flags are set by process_xxx

Browse Source 
When any processing remains on a buffer, it must be up to the
processing functions to set the termination flags, because they
are the only ones who know about higher levels.
This commit is contained in:
Willy Tarreau 2008-08-17 14:38:41 +02:00
parent 507385d0e1
commit f495ddf9d4
1 changed files with 60 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
src/proto_http.c
View File

@ -794,9 +794,10 @@ void process_session(struct task *t, int *next)
if (unlikely((global.mode & MODE_DEBUG) && if (unlikely((global.mode & MODE_DEBUG) &&
(!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE)))) { (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE)))) {
int len; int len;
len = sprintf(trash, "%08x:%s.closed[%04x:%04x]\n", len = sprintf(trash, "%08x:%s.closed[%04x:%04x] (term_trace=0x%08x)\n",
s->uniq_id, s->be->id, s->uniq_id, s->be->id,
(unsigned short)s->cli_fd, (unsigned short)s->srv_fd); (unsigned short)s->cli_fd, (unsigned short)s->srv_fd,
s->term_trace);
write(1, trash, len); write(1, trash, len);
} }
@ -1652,10 +1653,10 @@ int process_request(struct session *t)
struct tcp_rule *rule; struct tcp_rule *rule;
int partial; int partial;
/* We will abort if we encounter a read error. In theory, /* We will abort if we encounter a read error. In theory, we
* we should not abort if we get a close, it might be * should not abort if we get a close, it might be valid,
* valid, also very unlikely. FIXME: we'll abort for now, * although very unlikely. FIXME: we'll abort for now, this
* this will be easier to change later. * will be easier to change later.
*/ */
if (req->flags & BF_READ_ERROR) { if (req->flags & BF_READ_ERROR) {
t->inspect_exp = TICK_ETERNITY; t->inspect_exp = TICK_ETERNITY;
@ -3084,22 +3085,22 @@ int process_cli(struct session *t)
fd_delete(t->cli_fd); fd_delete(t->cli_fd);
t->cli_state = CL_STCLOSE; t->cli_state = CL_STCLOSE;
trace_term(t, TT_HTTP_CLI_1); trace_term(t, TT_HTTP_CLI_1);
if (!(t->flags & SN_ERR_MASK)) if (!(t->analysis & AN_REQ_ANY)) {
t->flags |= SN_ERR_CLICL; if (!(t->flags & SN_ERR_MASK))
if (!(t->flags & SN_FINST_MASK)) { t->flags |= SN_ERR_CLICL;
if (t->analysis & AN_REQ_ANY) if (!(t->flags & SN_FINST_MASK)) {
t->flags |= SN_FINST_R; if (t->pend_pos)
else if (t->pend_pos) t->flags |= SN_FINST_Q;
t->flags |= SN_FINST_Q; else if (t->srv_state == SV_STCONN)
else if (t->srv_state == SV_STCONN) t->flags |= SN_FINST_C;
t->flags |= SN_FINST_C; else
else t->flags |= SN_FINST_D;
t->flags |= SN_FINST_D; }
} }
goto update_state; goto update_state;
} }
/* last read, or end of server write */ /* last read, or end of server write */
else if (!(req->flags & BF_SHUTR) && /* already done */ else if (!(req->flags & BF_SHUTR) && /* not already done */
req->flags & (BF_READ_NULL | BF_SHUTW)) { req->flags & (BF_READ_NULL | BF_SHUTW)) {
buffer_shutr(req); buffer_shutr(req);
if (!(rep->flags & BF_SHUTW)) { if (!(rep->flags & BF_SHUTW)) {
@ -3116,7 +3117,7 @@ int process_cli(struct session *t)
/* last server read and buffer empty : we only check them when we're /* last server read and buffer empty : we only check them when we're
* allowed to forward the data. * allowed to forward the data.
*/ */
else if (!(rep->flags & BF_SHUTW) && /* already done */ else if (!(rep->flags & BF_SHUTW) && /* not already done */
rep->flags & BF_EMPTY && rep->flags & BF_MAY_FORWARD && rep->flags & BF_EMPTY && rep->flags & BF_MAY_FORWARD &&
rep->flags & BF_SHUTR && !(t->flags & SN_SELF_GEN)) { rep->flags & BF_SHUTR && !(t->flags & SN_SELF_GEN)) {
buffer_shutw(rep); buffer_shutw(rep);
@ -3147,17 +3148,17 @@ int process_cli(struct session *t)
t->cli_state = CL_STCLOSE; t->cli_state = CL_STCLOSE;
trace_term(t, TT_HTTP_CLI_7); trace_term(t, TT_HTTP_CLI_7);
} }
if (!(t->flags & SN_ERR_MASK)) if (!(t->analysis & AN_REQ_ANY)) {
t->flags |= SN_ERR_CLITO; if (!(t->flags & SN_ERR_MASK))
if (!(t->flags & SN_FINST_MASK)) { t->flags |= SN_ERR_CLITO;
if (t->analysis & AN_REQ_ANY) if (!(t->flags & SN_FINST_MASK)) {
t->flags |= SN_FINST_R; if (t->pend_pos)
else if (t->pend_pos) t->flags |= SN_FINST_Q;
t->flags |= SN_FINST_Q; else if (t->srv_state == SV_STCONN)
else if (t->srv_state == SV_STCONN) t->flags |= SN_FINST_C;
t->flags |= SN_FINST_C; else
else t->flags |= SN_FINST_D;
t->flags |= SN_FINST_D; }
} }
goto update_state; goto update_state;
} }
@ -3177,18 +3178,17 @@ int process_cli(struct session *t)
t->cli_state = CL_STCLOSE; t->cli_state = CL_STCLOSE;
trace_term(t, TT_HTTP_CLI_9); trace_term(t, TT_HTTP_CLI_9);
} }
if (!(t->analysis & AN_REQ_ANY)) {
if (!(t->flags & SN_ERR_MASK)) if (!(t->flags & SN_ERR_MASK))
t->flags |= SN_ERR_CLITO; t->flags |= SN_ERR_CLITO;
if (!(t->flags & SN_FINST_MASK)) { if (!(t->flags & SN_FINST_MASK)) {
if (t->analysis & AN_REQ_ANY) if (t->pend_pos)
t->flags |= SN_FINST_R; t->flags |= SN_FINST_Q;
else if (t->pend_pos) else if (t->srv_state == SV_STCONN)
t->flags |= SN_FINST_Q; t->flags |= SN_FINST_C;
else if (t->srv_state == SV_STCONN) else
t->flags |= SN_FINST_C; t->flags |= SN_FINST_D;
else }
t->flags |= SN_FINST_D;
} }
goto update_state; goto update_state;
} }
@ -3598,11 +3598,12 @@ int process_srv(struct session *t)
t->be->failed_resp++; t->be->failed_resp++;
t->srv_state = SV_STCLOSE; t->srv_state = SV_STCLOSE;
trace_term(t, TT_HTTP_SRV_6); trace_term(t, TT_HTTP_SRV_6);
if (!(t->flags & SN_ERR_MASK)) if (!(t->analysis & AN_RTR_ANY)) {
t->flags |= SN_ERR_SRVCL; if (!(t->flags & SN_ERR_MASK))
if (!(t->flags & SN_FINST_MASK)) t->flags |= SN_ERR_SRVCL;
t->flags |= SN_FINST_D; if (!(t->flags & SN_FINST_MASK))
t->flags |= SN_FINST_D;
}
if (may_dequeue_tasks(t->srv, t->be)) if (may_dequeue_tasks(t->srv, t->be))
process_srv_queue(t->srv); process_srv_queue(t->srv);
@ -3681,10 +3682,12 @@ int process_srv(struct session *t)
if (may_dequeue_tasks(t->srv, t->be)) if (may_dequeue_tasks(t->srv, t->be))
process_srv_queue(t->srv); process_srv_queue(t->srv);
} }
if (!(t->flags & SN_ERR_MASK)) if (!(t->analysis & AN_RTR_ANY)) {
t->flags |= SN_ERR_SRVTO; if (!(t->flags & SN_ERR_MASK))
if (!(t->flags & SN_FINST_MASK)) t->flags |= SN_ERR_SRVTO;
t->flags |= SN_FINST_D; if (!(t->flags & SN_FINST_MASK))
t->flags |= SN_FINST_D;
}
goto update_state; goto update_state;
} }
@ -3711,11 +3714,12 @@ int process_srv(struct session *t)
if (may_dequeue_tasks(t->srv, t->be)) if (may_dequeue_tasks(t->srv, t->be))
process_srv_queue(t->srv); process_srv_queue(t->srv);
} }
if (!(t->flags & SN_ERR_MASK)) if (!(t->analysis & AN_RTR_ANY)) {
t->flags |= SN_ERR_SRVTO; if (!(t->flags & SN_ERR_MASK))
if (!(t->flags & SN_FINST_MASK)) t->flags |= SN_ERR_SRVTO;
t->flags |= SN_FINST_D; if (!(t->flags & SN_FINST_MASK))
t->flags |= SN_FINST_D;
}
goto update_state; goto update_state;
} }