From: Willy Tarreau <w@1wt.eu>
Date: Tue, 1 Jun 2010 08:56:34 +0000 (+0200)
Subject: [MINOR] frontend: rely on the frontend and not the backend for INDEPSTR
X-Git-Tag: v1.5-dev8~581
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee55dc024be4eb7e67f43b7a7b61820b7f554d38;p=thirdparty%2Fhaproxy.git

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

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.
---

diff --git a/src/dumpstats.c b/src/dumpstats.c
index dee7aa4a0e..949fe2b006 100644
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -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].fd = -1; /* just to help with debugging */
 	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;
 
 	stream_int_register_handler(&s->si[1], stats_io_handler);
diff --git a/src/frontend.c b/src/frontend.c
index e2f24ad7fe..fc40929f45 100644
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -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].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->srv = s->prev_srv = s->srv_conn = NULL;
diff --git a/src/proto_http.c b/src/proto_http.c
index 94ed2c5993..920dca99c4 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -3742,7 +3742,7 @@ void http_end_txn_clean_session(struct session *s)
 	s->txn.meth = 0;
 	http_reset_txn(s);
 	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;
 
 	/* if the request buffer is not empty, it means we're