RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-24 06:36:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: http: remove buffer arg in http_buffer_heavy_realign

Browse Source 
The buffer pointer is now taken from the http_msg. The function has also
been renamed "http_message_realign".
This commit is contained in:
Willy Tarreau 2012-03-09 13:58:04 +01:00
parent 418bfcc794
commit 21710ffa35
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/proto_http.c
View File

@ -1954,9 +1954,13 @@ int http_skip_chunk_crlf(struct buffer *buf, struct http_msg *msg)
return 1;
}
/* This function may only be used when the buffer's o is empty */
void http_buffer_heavy_realign(struct buffer *buf, struct http_msg *msg)
/* This function realigns a possibly wrapping http message at the beginning
* of its buffer. The function may only be used when the buffer's tail is
* empty.
*/
void http_message_realign(struct http_msg *msg)
{
struct buffer *buf = msg->buf;
int off = buf->data + buf->size - buf->p;
/* two possible cases :
@ -2060,7 +2064,7 @@ int http_wait_for_request(struct session *s, struct buffer *req, int an_bit)
}
if (buffer_wrap_add(req, req->p + req->i) < buffer_wrap_add(req, req->p + msg->next) ||
buffer_wrap_add(req, req->p + req->i) > req->data + req->size - global.tune.maxrewrite)
http_buffer_heavy_realign(req, msg);
http_message_realign(msg);
}
/* Note that we have the same problem with the response ; we
@ -4470,7 +4474,7 @@ int http_wait_for_response(struct session *s, struct buffer *rep, int an_bit)
return 0;
}
if (rep->i <= rep->size - global.tune.maxrewrite)
http_buffer_heavy_realign(rep, msg);
http_message_realign(msg);
}
if (likely(msg->next < rep->i))