NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commitfd2c30f

committed

Nginx: minor improve

1 parent9b13d24 commitfd2c30fCopy full SHA for fd2c30f

File tree

2 files changed

-3

lines changed

nginx/modsecurity
- ngx_http_modsecurity.c
- ngx_pool_context.c

2 files changed

-3

lines changed

`‎nginx/modsecurity/ngx_http_modsecurity.c‎`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1108,7 +1108,7 @@ ngx_http_modsecurity_header_filter(ngx_http_request_t *r) {`
`1108`	`1108`	`returnngx_http_next_header_filter(r);`
`1109`	`1109`	`}`
`1110`	`1110`
`1111`		`-if (r!=r->main\|\| !cf->enable\|\|ctx->complete) {`
	`1111`	`+if (r!=r->main\|\| !cf->enable\|\|ctx==NULL\|\|ctx->complete) {`
`1112`	`1112`	`returnngx_http_next_header_filter(r);`
`1113`	`1113`	`}`
`1114`	`1114`
`@@ -1140,6 +1140,10 @@ ngx_http_modsecurity_header_filter(ngx_http_request_t *r) {`
`1140`	`1140`	`}`
`1141`	`1141`
`1142`	`1142`	`/* SecResponseBodyAccess on, process rules in body filter */`
	`1143`	`+`
	`1144`	`+/* pretend we are ngx_http_header_filter */`
	`1145`	`+r->header_sent=1;`
	`1146`	`+`
`1143`	`1147`	`r->filter_need_in_memory=1;`
`1144`	`1148`	`returnNGX_OK;`
`1145`	`1149`	`}`
`@@ -1156,7 +1160,7 @@ ngx_http_modsecurity_body_filter(ngx_http_request_t r, ngx_chain_t in)`
`1156`	`1160`	`cf=ngx_http_get_module_loc_conf(r,ngx_http_modsecurity);`
`1157`	`1161`	`ctx=ngx_http_get_module_ctx(r,ngx_http_modsecurity);`
`1158`	`1162`
`1159`		`-if (r!=r->main\|\| !cf->enable\|\|ctx->complete) {`
	`1163`	`+if (r!=r->main\|\| !cf->enable\|\|ctx==NULL\|\|ctx->complete) {`
`1160`	`1164`	`returnngx_http_next_body_filter(r,in);`
`1161`	`1165`	`}`
`1162`	`1166`
`@@ -1212,6 +1216,7 @@ ngx_http_modsecurity_body_filter(ngx_http_request_t r, ngx_chain_t in)`
`1212`	`1216`	`r->headers_out.content_length=NULL;/* header filter will set this */`
`1213`	`1217`	`}`
`1214`	`1218`
	`1219`	`+r->header_sent=0;`
`1215`	`1220`	`rc=ngx_http_next_header_filter(r);`
`1216`	`1221`
`1217`	`1222`	`if (rc==NGX_ERROR\|\|rc>NGX_OK) {`

`‎nginx/modsecurity/ngx_pool_context.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ ngx_pool_context_init_conf(ngx_cycle_t cycle, void conf)`
`196`	`196`	`{`
`197`	`197`	`ngx_pool_context_conf_t*pcf=conf;`
`198`	`198`
`199`		`-ngx_conf_init_uint_value(pcf->size,NGX_POOL_CTX_SIZE);`
	`199`	`+ngx_conf_init_uint_value(pcf->size,cycle->connection_n);`
`200`	`200`
`201`	`201`	`ngx_pool_context_hash_size=pcf->size;`
`202`	`202`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitfd2c30f

File tree

2 files changed

2 files changed

`‎nginx/modsecurity/ngx_http_modsecurity.c‎`

`‎nginx/modsecurity/ngx_pool_context.c‎`

0 commit comments