RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-05 19:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: http: only allocate the temporary compression buffer when needed

Browse Source 
Since we know when the buffer is needed, only check for its allocation
at the same place in order to avoid useless tests on the normal path.
This commit is contained in:
Willy Tarreau 2014-04-21 11:27:29 +02:00
parent d5a6783ac9
commit 32b5ab2a28
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/proto_http.c
View File

@ -6179,12 +6179,6 @@ int http_response_forward_body(struct session *s, struct channel *res, int an_bi
/* in most states, we should abort in case of early close */
channel_auto_close(res);
/* this is the first time we need the compression buffer */
if (s->comp_algo != NULL && tmpbuf == NULL) {
if ((tmpbuf = pool_alloc2(pool2_buffer)) == NULL)
goto aborted_xfer; /* no memory */
}
if (msg->sov) {
/* we have msg->sov which points to the first byte of message
* body, and res->buf.p still points to the beginning of the
@ -6207,8 +6201,19 @@ int http_response_forward_body(struct session *s, struct channel *res, int an_bi
}
}
if (s->comp_algo != NULL && msg->msg_state < HTTP_MSG_TRAILERS) {
ret = http_compression_buffer_init(s, res->buf, tmpbuf); /* init a buffer with headers */
if (unlikely(s->comp_algo != NULL) && msg->msg_state < HTTP_MSG_TRAILERS) {
/* We need a compression buffer in the DATA state to put the
* output of compressed data, and in CRLF state to let the
* TRAILERS state finish the job of removing the trailing CRLF.
*/
if (unlikely(tmpbuf == NULL)) {
/* this is the first time we need the compression buffer */
tmpbuf = pool_alloc2(pool2_buffer);
if (tmpbuf == NULL)
goto aborted_xfer; /* no memory */
}
ret = http_compression_buffer_init(s, res->buf, tmpbuf);
if (ret < 0) {
res->flags |= CF_WAKE_WRITE;
goto missing_data; /* not enough spaces in buffers */