RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-14 23:44:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

* some commented out debug code was not usable. This is fixed.

Browse Source
This commit is contained in:
Willy TARREAU 2006-03-01 22:34:48 +01:00
parent 1cec83c754
commit b45124729a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
haproxy.c
View File

@ -4039,7 +4039,7 @@ int process_srv(struct session *t) {
} }
else if (s == SV_STCONN) { /* connection in progress */ else if (s == SV_STCONN) { /* connection in progress */
if (t->res_sw == RES_SILENT && tv_cmp2_ms(&t->cnexpire, &now) > 0) { if (t->res_sw == RES_SILENT && tv_cmp2_ms(&t->cnexpire, &now) > 0) {
//fprintf(stderr,"1: c=%d, s=%d\n", c, s); //fprintf(stderr,"1: c=%d, s=%d, now=%d.%06d, exp=%d.%06d\n", c, s, now.tv_sec, now.tv_usec, t->cnexpire.tv_sec, t->cnexpire.tv_usec);
return 0; /* nothing changed */ return 0; /* nothing changed */
} }
else if (t->res_sw == RES_SILENT || t->res_sw == RES_ERROR) { else if (t->res_sw == RES_SILENT || t->res_sw == RES_ERROR) {
@ -4932,11 +4932,11 @@ int process_session(struct task *t) {
do { do {
fsm_resync = 0; fsm_resync = 0;
//fprintf(stderr,"before_cli:cli=%d, srv=%d\n", t->cli_state, t->srv_state); //fprintf(stderr,"before_cli:cli=%d, srv=%d\n", s->cli_state, s->srv_state);
fsm_resync |= process_cli(s); fsm_resync |= process_cli(s);
//fprintf(stderr,"cli/srv:cli=%d, srv=%d\n", t->cli_state, t->srv_state); //fprintf(stderr,"cli/srv:cli=%d, srv=%d\n", s->cli_state, s->srv_state);
fsm_resync |= process_srv(s); fsm_resync |= process_srv(s);
//fprintf(stderr,"after_srv:cli=%d, srv=%d\n", t->cli_state, t->srv_state); //fprintf(stderr,"after_srv:cli=%d, srv=%d\n", s->cli_state, s->srv_state);
} while (fsm_resync); } while (fsm_resync);
if (s->cli_state != CL_STCLOSE || s->srv_state != SV_STCLOSE) { if (s->cli_state != CL_STCLOSE || s->srv_state != SV_STCLOSE) {