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

MINOR: h1: provide a distinct init() function for request and response

Browse Source 
h1m_init() used to handle response only since it was used by the H1
client code. Let's have one init per direction.
This commit is contained in:
Willy Tarreau 2018-09-11 13:51:19 +02:00
parent acc295cab3
commit 7f437ff81c
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/proto/h1.h
View File

@ -300,8 +300,8 @@ static inline int h1_parse_chunk_size(const struct buffer *buf, int start, int s
return -stop;
}
/* initializes an H1 message */
static inline struct h1m *h1m_init(struct h1m *h1m)
/* initializes an H1 message for a request */
static inline struct h1m *h1m_init_req(struct h1m *h1m)
{
h1m->state = H1_MSG_RQBEFORE;
h1m->next = 0;
@ -314,4 +314,18 @@ static inline struct h1m *h1m_init(struct h1m *h1m)
return h1m;
}
/* initializes an H1 message for a response */
static inline struct h1m *h1m_init_res(struct h1m *h1m)
{
h1m->state = H1_MSG_RPBEFORE;
h1m->next = 0;
h1m->status = 0;
h1m->flags = 0;
h1m->curr_len = 0;
h1m->body_len = 0;
h1m->err_pos = 0;
h1m->err_state = 0;
return h1m;
}
#endif /* _PROTO_H1_H */

8
src/mux_h2.c
View File

@ -690,8 +690,8 @@ static struct h2s *h2c_stream_new(struct h2c *h2c, int id)
h2s->errcode = H2_ERR_NO_ERROR;
h2s->st = H2_SS_IDLE;
h2s->rxbuf = BUF_NULL;
h1m_init(&h2s->req);
h1m_init(&h2s->res);
h1m_init_req(&h2s->req);
h1m_init_res(&h2s->res);
h2s->by_id.key = h2s->id = id;
h2c->max_id = id;
@ -3231,9 +3231,7 @@ static size_t h2s_frt_make_resp_headers(struct h2s *h2s, const struct buffer *bu
}
else if (h1m->status >= 100 && h1m->status < 200) {
/* we'll let the caller check if it has more headers to send */
h1m->state = H1_MSG_RPBEFORE;
h1m->status = 0;
h1m->flags = 0;
h1m_init_res(h1m);
goto end;
}
else