[MEDIUM] session: don't assign conn_retries upon accept() anymore
The conn_retries attribute is now assigned when switching from SI_ST_INI
to SI_ST_REQ. This eliminates one of the last dependencies on the backend
in the frontend's accept() function.
diff --git a/src/frontend.c b/src/frontend.c
index d51f2fd..e2f24ad 100644
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -157,7 +157,6 @@
s->srv = s->prev_srv = s->srv_conn = NULL;
s->pend_pos = NULL;
- s->si[1].conn_retries = s->be->conn_retries;
/* init store persistence */
s->store_count = 0;
diff --git a/src/proto_http.c b/src/proto_http.c
index 280abf7..94ed2c5 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -6726,7 +6726,6 @@
s->store_count = 0;
s->pend_pos = NULL;
- s->req->cons->conn_retries = s->be->conn_retries;
s->req->flags |= BF_READ_DONTWAIT; /* one read is usually enough */
diff --git a/src/proxy.c b/src/proxy.c
index cd7f682..2949ec7 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -719,7 +719,6 @@
proxy_inc_be_ctr(be);
/* assign new parameters to the session from the new backend */
- s->si[1].conn_retries = be->conn_retries;
s->si[1].flags &= ~SI_FL_INDEP_STR;
if (be->options2 & PR_O2_INDEPSTR)
s->si[1].flags |= SI_FL_INDEP_STR;
diff --git a/src/session.c b/src/session.c
index 79432cf..6317442 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1380,6 +1380,7 @@
* request.
*/
s->req->cons->state = SI_ST_REQ; /* new connection requested */
+ s->req->cons->conn_retries = s->be->conn_retries;
if (unlikely(s->req->cons->iohandler && !s->req->cons->connect)) {
s->req->cons->state = SI_ST_EST; /* connection established */
s->rep->flags |= BF_READ_ATTACHED; /* producer is now attached */