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

MINOR: proto_http: Remove the unused flag HTTP_MSGF_WAIT_CONN

Browse Source 
This flag is set but never used. So remove it.
This commit is contained in:
Christopher Faulet 2019-07-17 11:21:36 +02:00
parent c41547b66e
commit cc76d5b9a1
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/types/proto_http.h
View File

@ -118,11 +118,8 @@
#define HTTP_MSGF_XFER_LEN 0x00000004 /* message xfer size can be determined */ #define HTTP_MSGF_XFER_LEN 0x00000004 /* message xfer size can be determined */
#define HTTP_MSGF_VER_11 0x00000008 /* the message is HTTP/1.1 or above */ #define HTTP_MSGF_VER_11 0x00000008 /* the message is HTTP/1.1 or above */
/* If this flag is set, we don't process the body until the connect() is confirmed. /* unused: 0x00000010 */
* This is only used by the request forwarding function to protect the buffer
* contents if something needs them during a redispatch.
*/
#define HTTP_MSGF_WAIT_CONN 0x00000010 /* Wait for connect() to be confirmed before processing body */
#define HTTP_MSGF_COMPRESSING 0x00000020 /* data compression is in progress */ #define HTTP_MSGF_COMPRESSING 0x00000020 /* data compression is in progress */
#define HTTP_MSGF_BODYLESS 0x00000040 /* The message has no body (content-length = 0) */ #define HTTP_MSGF_BODYLESS 0x00000040 /* The message has no body (content-length = 0) */

9
src/proxy.c
View File

@ -1464,15 +1464,6 @@ int stream_set_backend(struct stream *s, struct proxy *be)
} }
} }
/* If an LB algorithm needs to access some pre-parsed body contents,
* we must not start to forward anything until the connection is
* confirmed otherwise we'll lose the pointer to these data and
* prevent the hash from being doable again after a redispatch.
*/
if (be->mode == PR_MODE_HTTP &&
(be->lbprm.algo & (BE_LB_KIND | BE_LB_PARM)) == (BE_LB_KIND_HI | BE_LB_HASH_PRM))
s->txn->req.flags |= HTTP_MSGF_WAIT_CONN;
/* we may request to parse a request body */ /* we may request to parse a request body */
if (be->options & PR_O_WREQ_BODY) if (be->options & PR_O_WREQ_BODY)
s->req.analysers |= AN_REQ_HTTP_BODY; s->req.analysers |= AN_REQ_HTTP_BODY;