RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-11 03:31:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: h1: remove the unused states from h1m_state

Browse Source 
States ERROR, 100_SENT, ENDING, CLOSE, CLOSING are not used at all for
the parsers. It's possible that a few others may disappear as well.
This commit is contained in:
Willy Tarreau 2018-09-11 12:01:48 +02:00
parent b3b0152b6f
commit acc295cab3
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/proto/h1.h
View File

@ -150,17 +150,12 @@ static inline const char *h1m_state_str(enum h1_state msg_state)
case H1_MSG_HDR_L2_LF: return "MSG_HDR_L2_LF";
case H1_MSG_HDR_L2_LWS: return "MSG_HDR_L2_LWS";
case H1_MSG_LAST_LF: return "MSG_LAST_LF";
case H1_MSG_ERROR: return "MSG_ERROR";
case H1_MSG_BODY: return "MSG_BODY";
case H1_MSG_100_SENT: return "MSG_100_SENT";
case H1_MSG_CHUNK_SIZE: return "MSG_CHUNK_SIZE";
case H1_MSG_DATA: return "MSG_DATA";
case H1_MSG_CHUNK_CRLF: return "MSG_CHUNK_CRLF";
case H1_MSG_TRAILERS: return "MSG_TRAILERS";
case H1_MSG_ENDING: return "MSG_ENDING";
case H1_MSG_DONE: return "MSG_DONE";
case H1_MSG_CLOSING: return "MSG_CLOSING";
case H1_MSG_CLOSED: return "MSG_CLOSED";
case H1_MSG_TUNNEL: return "MSG_TUNNEL";
default: return "MSG_??????";
}

22
include/types/h1.h
View File

@ -120,27 +120,19 @@ enum h1m_state {
H1_MSG_LAST_LF = 25, // parsing last LF
/* error state : must be before H1_MSG_BODY so that (>=BODY) always indicates
* that data are being processed.
*/
H1_MSG_ERROR = 26, // an error occurred
/* Body processing.
* The state H1_MSG_BODY is a delimiter to know if we're waiting for headers
* or body. All the sub-states below also indicate we're processing the body,
* with some additional information.
*/
H1_MSG_BODY = 27, // parsing body at end of headers
H1_MSG_100_SENT = 28, // parsing body after a 100-Continue was sent
H1_MSG_CHUNK_SIZE = 29, // parsing the chunk size (RFC7230 #4.1)
H1_MSG_DATA = 30, // skipping data chunk / content-length data
H1_MSG_CHUNK_CRLF = 31, // skipping CRLF after data chunk
H1_MSG_TRAILERS = 32, // trailers (post-data entity headers)
H1_MSG_BODY = 26, // parsing body at end of headers
H1_MSG_CHUNK_SIZE = 27, // parsing the chunk size (RFC7230 #4.1)
H1_MSG_DATA = 28, // skipping data chunk / content-length data
H1_MSG_CHUNK_CRLF = 29, // skipping CRLF after data chunk
H1_MSG_TRAILERS = 30, // trailers (post-data entity headers)
/* we enter this state when we've received the end of the current message */
H1_MSG_ENDING = 33, // message end received, wait that the filters end too
H1_MSG_DONE = 34, // message end received, waiting for resync or close
H1_MSG_CLOSING = 35, // shutdown_w done, not all bytes sent yet
H1_MSG_CLOSED = 36, // shutdown_w done, all bytes sent
H1_MSG_TUNNEL = 37, // tunneled data after DONE
H1_MSG_DONE = 31, // message end received, waiting for resync or close
H1_MSG_TUNNEL = 32, // tunneled data after DONE
} __attribute__((packed));