Le 22/09/2016 à 04:05, Bertrand Jacquin a écrit :
> On Tue, Sep 20, 2016 at 08:16:09AM +0200, Willy Tarreau wrote:
>> Hi Bertrand,
>>
>> On Tue, Sep 20, 2016 at 12:13:32AM +0100, Bertrand Jacquin wrote:
>>>> And finally, If you can share with me your HA and
>>>> Nginx configurations, this could help.
>>>
>>> I'm attaching a strip down version of haproxy/nginx/php-fpm on which I
>>> can reproduice this issue.
>>
>> I think another thing would be extremely useful, it would be a full-packet
>> network capture between haproxy and nginx so that we have the full headers,
>> the chunk sizes (if any) and the response timing, which generally matters a
>> lot. Ideally the dump in text (or binary) format in a distinct file using
>> curl -i would be nice as well.
>
> Sure thing, you will find attached a tcpdump between haproxy and nginx
> along with a curl output.
>
> I changed initial configuration to use TCP instead of UNIX socket for
> capture purpose. I also removed the proxy protocol between haproxy and
> nginx to get an easier output to parse.
>
Hi Bertrand,
Thanks for all these information. It helps me to find the bug. I
attached a patch. Could you check if it fixes your bug ?
Willy, if Bertrand confirms that his bug is gone, and if everything is
ok for you, you will be able to merge it.
--
Christopher Faulet
>From d756fba92d1c14ab80c2c962843ddd556c5135ea Mon Sep 17 00:00:00 2001
From: Christopher Faulet <christopher.fau...@capflam.org>
Date: Thu, 22 Sep 2016 15:31:43 +0200
Subject: [PATCH] BUG: http/compression: Fix how chunked data are copied during
the HTTP body parsing
When the compression is enable on HTTP responses, the chunked data are copied in
a temporary buffer during the HTTP body parsing and then compressed when
everything is forwarded to the client. But the amout of data that can be copied
was not correctly calculated. In many cases, it worked, else on the edge when
the channel buffer was almost full.
---
src/flt_http_comp.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c
index 9ddc858..249ccdf 100644
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -177,15 +177,17 @@ comp_http_data(struct stream *s, struct filter *filter, struct http_msg *msg)
}
if (msg->flags & HTTP_MSGF_TE_CHNK) {
- int block = bi_contig_data(buf);
+ int block;
len = MIN(tmpbuf->size - buffer_len(tmpbuf), len);
- if (len > block) {
- memcpy(bi_end(tmpbuf), b_ptr(buf, *nxt), block);
- memcpy(bi_end(tmpbuf)+block, buf->data, len - block);
- }
- else
- memcpy(bi_end(tmpbuf), b_ptr(buf, *nxt), len);
+
+ b_adv(buf, *nxt);
+ block = bi_contig_data(buf);
+ memcpy(bi_end(tmpbuf), bi_ptr(buf), block);
+ if (len > block)
+ memcpy(bi_end(tmpbuf)+block, buf->data, len-block);
+ b_rew(buf, *nxt);
+
tmpbuf->i += len;
ret = len;
}
--
2.7.4
