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

[MINOR] frontend: rely on the frontend and not the backend for INDEPSTR

Browse Source 
Till now, the frontend relied on the backend's options for INDEPSTR,
while at the time of accept, the frontend and backend are the same.
So we now use the frontend's pointer instead of the backend and we
don't have any dependency on the backend anymore in the frontend's
accept code.
This commit is contained in:
Willy Tarreau 2010-06-01 10:56:34 +02:00
parent 070ceb6cfb
commit ee55dc024b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dumpstats.c
View File

@ -136,7 +136,7 @@ int stats_accept(struct listener *l, int cfd, struct sockaddr_storage *addr)
s->si[1].exp = TICK_ETERNITY; s->si[1].exp = TICK_ETERNITY;
s->si[1].fd = -1; /* just to help with debugging */ s->si[1].fd = -1; /* just to help with debugging */
s->si[1].flags = SI_FL_NONE; s->si[1].flags = SI_FL_NONE;
if (s->be->options2 & PR_O2_INDEPSTR) if (s->fe->options2 & PR_O2_INDEPSTR)
s->si[1].flags |= SI_FL_INDEP_STR; s->si[1].flags |= SI_FL_INDEP_STR;
stream_int_register_handler(&s->si[1], stats_io_handler); stream_int_register_handler(&s->si[1], stats_io_handler);

2
src/frontend.c
View File

@ -152,7 +152,7 @@ int frontend_accept(struct listener *l, int cfd, struct sockaddr_storage *addr)
s->si[1].fd = -1; /* just to help with debugging */ s->si[1].fd = -1; /* just to help with debugging */
s->si[1].flags = SI_FL_NONE; s->si[1].flags = SI_FL_NONE;
if (likely(s->be->options2 & PR_O2_INDEPSTR)) if (likely(s->fe->options2 & PR_O2_INDEPSTR))
s->si[1].flags |= SI_FL_INDEP_STR; s->si[1].flags |= SI_FL_INDEP_STR;
s->srv = s->prev_srv = s->srv_conn = NULL; s->srv = s->prev_srv = s->srv_conn = NULL;

2
src/proto_http.c
View File

@ -3742,7 +3742,7 @@ void http_end_txn_clean_session(struct session *s)
s->txn.meth = 0; s->txn.meth = 0;
http_reset_txn(s); http_reset_txn(s);
s->txn.flags |= TX_NOT_FIRST | TX_WAIT_NEXT_RQ; s->txn.flags |= TX_NOT_FIRST | TX_WAIT_NEXT_RQ;
if (s->be->options2 & PR_O2_INDEPSTR) if (s->fe->options2 & PR_O2_INDEPSTR)
s->req->cons->flags |= SI_FL_INDEP_STR; s->req->cons->flags |= SI_FL_INDEP_STR;
/* if the request buffer is not empty, it means we're /* if the request buffer is not empty, it means we're