RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MINOR: session: remove debugging code 

The memset() was put here to corrupt memory for a debugging test,
it's not needed anymore and was unfortunately committed. It does
not harm anyway, it probably just slightly affects performance.
This commit is contained in:
Willy Tarreau 2013-12-16 10:12:54 +01:00
parent 6b9d3a8a5b
commit 2cff2f7bb8
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/session.c
View File

@ -127,12 +127,6 @@ int session_accept(struct listener *l, int cfd, struct sockaddr_storage *addr)
proxy_inc_fe_conn_ctr(l, p); proxy_inc_fe_conn_ctr(l, p);
/* now evaluate the tcp-request layer4 rules. Since we expect to be able
* to abort right here as soon as possible, we check the rules before
* even initializing the stream interfaces.
*/
memset(&s->si[0], 0x55, sizeof(s->si[0]));
/* Add the minimum callbacks to prepare the connection's control layer. /* Add the minimum callbacks to prepare the connection's control layer.
* We need this so that we can safely execute the ACLs used by the * We need this so that we can safely execute the ACLs used by the
* "tcp-request connection" ruleset. We also carefully attach the * "tcp-request connection" ruleset. We also carefully attach the
@ -143,6 +137,10 @@ int session_accept(struct listener *l, int cfd, struct sockaddr_storage *addr)
conn_attach(cli_conn, s, &sess_conn_cb); conn_attach(cli_conn, s, &sess_conn_cb);
conn_ctrl_init(cli_conn); conn_ctrl_init(cli_conn);
/* now evaluate the tcp-request layer4 rules. Since we expect to be able
* to abort right here as soon as possible, we check the rules before
* even initializing the stream interfaces.
*/
if ((l->options & LI_O_TCP_RULES) && !tcp_exec_req_rules(s)) { if ((l->options & LI_O_TCP_RULES) && !tcp_exec_req_rules(s)) {
/* let's do a no-linger now to close with a single RST. */ /* let's do a no-linger now to close with a single RST. */
setsockopt(cfd, SOL_SOCKET, SO_LINGER, (struct linger *) &nolinger, sizeof(struct linger)); setsockopt(cfd, SOL_SOCKET, SO_LINGER, (struct linger *) &nolinger, sizeof(struct linger));