Skip to content

Commit 55b41d0

Browse files
committed
Fixes after review
1 parent f7cff06 commit 55b41d0

9 files changed

+4
-1477
lines changed

config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ ngx_addon_name=ngx_http_modsecurity_module
9393
#
9494
# For static compilation HTTP_FILTER_MODULES will be patched later.
9595

96-
modsecurity_dependency="ngx_http_link_func_module \
97-
ngx_http_postpone_filter_module \
96+
modsecurity_dependency="ngx_http_postpone_filter_module \
9897
ngx_http_ssi_filter_module \
9998
ngx_http_charset_filter_module \
10099
ngx_http_xslt_filter_module \

config.orig

Lines changed: 0 additions & 192 deletions
This file was deleted.

config.rej

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/ngx_http_modsecurity_body_filter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ ngx_http_modsecurity_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
165165

166166
/* XXX: I don't get how body from modsec being transferred to nginx's buffer. If so - after adjusting of nginx's
167167
XXX: body we can proceed to adjust body size (content-length). see xslt_body_filter() for example */
168-
ret = ngx_http_modsecurity_process_intervention(ctx->modsec_transaction, r, 0);
169168
ctx->resp_body_phase_time = ngx_http_modsecurity_compute_processing_time(start_tv);
169+
ret = ngx_http_modsecurity_process_intervention(ctx->modsec_transaction, r, 0);
170170
if (ret > 0) {
171171
return ret;
172172
}

src/ngx_http_modsecurity_header_filter.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,9 +529,8 @@ ngx_http_modsecurity_header_filter(ngx_http_request_t *r)
529529
old_pool = ngx_http_modsecurity_pcre_malloc_init(r->pool);
530530
msc_process_response_headers(ctx->modsec_transaction, status, http_response_ver);
531531
ngx_http_modsecurity_pcre_malloc_done(old_pool);
532-
ret = ngx_http_modsecurity_process_intervention(ctx->modsec_transaction, r, 0);
533-
534532
ctx->resp_headers_phase_time = ngx_http_modsecurity_compute_processing_time(start_tv);
533+
ret = ngx_http_modsecurity_process_intervention(ctx->modsec_transaction, r, 0);
535534

536535
if (r->error_page) {
537536
return ngx_http_next_header_filter(r);

0 commit comments

Comments
 (0)