From 21710ffa35db86799d0907c69fc36d356e4f3748 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 9 Mar 2012 13:58:04 +0100 Subject: [PATCH] MEDIUM: http: remove buffer arg in http_buffer_heavy_realign The buffer pointer is now taken from the http_msg. The function has also been renamed "http_message_realign". --- src/proto_http.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/proto_http.c b/src/proto_http.c index d1a0706bc3..61cef2621c 100644 --- a/src/proto_http.c +++ b/src/proto_http.c @@ -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)) -- 2.47.3