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

CLEANUP: http-ana: Remove TX_WAIT_NEXT_RQ unsued flag

Browse Source 
This flags is now unused. It was used in REQ_WAIT_HTTP analyser, when a
stream was waiting for a request, to set the keep-alive timeout or to avoid
to send HTTP errors to client.
This commit is contained in:
Christopher Faulet 2020-10-06 17:58:43 +02:00
parent 8bebd2fe52
commit da831fa068
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/debug/flags.c
View File

@ -296,7 +296,6 @@ void show_txn_flags(unsigned int f)
SHOW_FLAG(f, TX_NOT_FIRST);
SHOW_FLAG(f, TX_USE_PX_CONN);
SHOW_FLAG(f, TX_WAIT_NEXT_RQ);
SHOW_FLAG(f, TX_CON_WANT_TUN);
SHOW_FLAG(f, TX_CACHE_COOK);

2
include/haproxy/http_ana-t.h
View File

@ -64,7 +64,7 @@
#define TX_CON_WANT_TUN 0x00008000 /* Will be a tunnel (CONNECT or 101-Switching-Protocol) */
#define TX_WAIT_NEXT_RQ 0x00010000 /* waiting for the second request to start, use keep-alive timeout */
/* unsued 0x00010000 */
#define TX_USE_PX_CONN 0x00020000 /* Use "Proxy-Connection" instead of "Connection" */

6
src/http_ana.c
View File

@ -115,7 +115,6 @@ int http_wait_for_request(struct stream *s, struct channel *req, int an_bit)
proxy_inc_fe_req_ctr(sess->listener, sess->fe); /* one more valid request for this FE */
/* kill the pending keep-alive timeout */
txn->flags &= ~TX_WAIT_NEXT_RQ;
req->analyse_exp = TICK_ETERNITY;
BUG_ON(htx_get_first_type(htx) != HTX_BLK_REQ_SL);
@ -4425,7 +4424,6 @@ void http_reply_and_close(struct stream *s, short status, struct http_reply *msg
end:
s->res.wex = tick_add_ifset(now_ms, s->res.wto);
s->txn->flags &= ~TX_WAIT_NEXT_RQ;
channel_auto_read(&s->req);
channel_abort(&s->req);
@ -4923,9 +4921,7 @@ void http_init_txn(struct stream *s)
struct http_txn *txn = s->txn;
struct conn_stream *cs = objt_cs(s->si[0].end);
txn->flags = ((cs && cs->flags & CS_FL_NOT_FIRST)
? (TX_NOT_FIRST|TX_WAIT_NEXT_RQ)
: 0);
txn->flags = ((cs && cs->flags & CS_FL_NOT_FIRST) ? TX_NOT_FIRST : 0);
txn->status = -1;
txn->http_reply = NULL;
write_u32(txn->cache_hash, 0);