artox/incubator-pagespeed-ngx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If we have an error we need to finalize with NGX_HTTP_INTERNAL_SERVER_ERROR not NGX_ERROR, but fixing that turned up another bug where we were rewriting error responses, opening us up to infinitely recursive rewrites.

Browse Source
This commit is contained in:
Jeff Kaufman
2012-11-01 16:38:07 -04:00
parent b9fff21986
commit 02cb718c27
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ngx_pagespeed.cc
+12 -5
View File
@@ -381,7 +381,8 @@ ngx_http_pagespeed_connection_read_handler(ngx_event_t* ev) {
} else { } else {
ngx_del_event(ev, NGX_READ_EVENT, 0); ngx_del_event(ev, NGX_READ_EVENT, 0);
ngx_http_pagespeed_set_buffered(ctx->r, false); ngx_http_pagespeed_set_buffered(ctx->r, false);
ngx_http_finalize_request(ctx->r, rc == NGX_OK ? NGX_DONE : NGX_ERROR); ngx_http_finalize_request(
ctx->r, rc == NGX_OK ? NGX_DONE : NGX_HTTP_INTERNAL_SERVER_ERROR);
} }
} }
@@ -569,6 +570,10 @@ ngx_http_pagespeed_body_filter(ngx_http_request_t* r, ngx_chain_t* in) {
return ngx_http_next_body_filter(r, in); return ngx_http_next_body_filter(r, in);
} }
// We don't want to handle requests with errors, but we should be dealing with
// that in the header filter and not initializing ctx.
CHECK(r->err_status == 0);
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http pagespeed filter \"%V\"", &r->uri); "http pagespeed filter \"%V\"", &r->uri);
@@ -611,10 +616,12 @@ ngx_http_pagespeed_header_filter(ngx_http_request_t* r) {
r->filter_need_in_memory = 1; r->filter_need_in_memory = 1;
int rc = ngx_http_pagespeed_create_request_context(r); if (r->err_status == 0) {
if (rc != NGX_OK) { int rc = ngx_http_pagespeed_create_request_context(r);
ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); if (rc != NGX_OK) {
return rc; ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
return rc;
}
} }
return ngx_http_next_header_filter(r); return ngx_http_next_header_filter(r);