From 0f3f268b3622130992228dd2d7ddd0fb2fd43ed1 Mon Sep 17 00:00:00 2001 From: Jeff Kaufman Date: Thu, 30 Jul 2015 07:27:19 -0400 Subject: [PATCH] Revert "Revert "Handle DoneAndSetHeaders() new second argument that wants to know whether the response is complete."" Needed for 1.9.32.6 to build. This reverts commit 19ebf69badb0d1b0867eaa3fd9b0c430f82753da. --- src/ngx_pagespeed.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ngx_pagespeed.cc b/src/ngx_pagespeed.cc index 986abe8898..e60a54c4df 100644 --- a/src/ngx_pagespeed.cc +++ b/src/ngx_pagespeed.cc @@ -1709,8 +1709,8 @@ void ps_release_request_context(void* data) { } if (ctx->recorder != NULL) { - ctx->recorder->Fail(); - ctx->recorder->DoneAndSetHeaders(NULL); // Deletes recorder. + // Deletes recorder. + ctx->recorder->DoneAndSetHeaders(NULL, false /* incomplete response */); ctx->recorder = NULL; } @@ -2506,7 +2506,9 @@ ngx_int_t ps_in_place_body_filter(ngx_http_request_t* r, ngx_chain_t* in) { if (cl->buf->last_buf || recorder->failed()) { ResponseHeaders response_headers; copy_response_headers_from_ngx(r, &response_headers); - ctx->recorder->DoneAndSetHeaders(&response_headers); + ctx->recorder->DoneAndSetHeaders( + &response_headers, + cl->buf->last_buf /* response is complete if last_buf is set */); ctx->recorder = NULL; break; }