Skip to content
Prev Previous commit
Next Next commit
Fixes after review
  • Loading branch information
awmackowiak committed May 18, 2022
commit 55b41d09a718df3aee6437482587f9af1ea8e20f
3 changes: 1 addition & 2 deletions config
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@ ngx_addon_name=ngx_http_modsecurity_module
#
# For static compilation HTTP_FILTER_MODULES will be patched later.

modsecurity_dependency="ngx_http_link_func_module \
ngx_http_postpone_filter_module \
modsecurity_dependency="ngx_http_postpone_filter_module \
ngx_http_ssi_filter_module \
ngx_http_charset_filter_module \
ngx_http_xslt_filter_module \
Expand Down
192 changes: 0 additions & 192 deletions config.orig

This file was deleted.

12 changes: 0 additions & 12 deletions config.rej

This file was deleted.

2 changes: 1 addition & 1 deletion src/ngx_http_modsecurity_body_filter.c
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ ngx_http_modsecurity_body_filter(ngx_http_request_t *r, ngx_chain_t *in)

/* XXX: I don't get how body from modsec being transferred to nginx's buffer. If so - after adjusting of nginx's
XXX: body we can proceed to adjust body size (content-length). see xslt_body_filter() for example */
ret = ngx_http_modsecurity_process_intervention(ctx->modsec_transaction, r, 0);
ctx->resp_body_phase_time = ngx_http_modsecurity_compute_processing_time(start_tv);
ret = ngx_http_modsecurity_process_intervention(ctx->modsec_transaction, r, 0);
if (ret > 0) {
return ret;
}
Expand Down
3 changes: 1 addition & 2 deletions src/ngx_http_modsecurity_header_filter.c
Original file line number Diff line number Diff line change
Expand Up @@ -529,9 +529,8 @@ ngx_http_modsecurity_header_filter(ngx_http_request_t *r)
old_pool = ngx_http_modsecurity_pcre_malloc_init(r->pool);
msc_process_response_headers(ctx->modsec_transaction, status, http_response_ver);
ngx_http_modsecurity_pcre_malloc_done(old_pool);
ret = ngx_http_modsecurity_process_intervention(ctx->modsec_transaction, r, 0);

ctx->resp_headers_phase_time = ngx_http_modsecurity_compute_processing_time(start_tv);
ret = ngx_http_modsecurity_process_intervention(ctx->modsec_transaction, r, 0);

if (r->error_page) {
return ngx_http_next_header_filter(r);
Expand Down
Loading