github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-30 19:47:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed NGINX compilation issues

Browse Source
This commit is contained in:
Breno Silva
2012-11-09 18:36:12 -04:00
parent 19d71f794c
commit 00b22f0c59
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -25,7 +25,7 @@
* Fixed bug when use ctl:ruleRemoveTargetByTag. * Fixed bug when use ctl:ruleRemoveTargetByTag.
* Fixed many IIS port bugs. * Fixed IIS and NGINX modules bugs.
* Fixed bug when @strmatch patterns use invalid escape sequence (Thanks Hideaki Hayashi). * Fixed bug when @strmatch patterns use invalid escape sequence (Thanks Hideaki Hayashi).

10
nginx/modsecurity/ngx_http_modsecurity.c
View File

@@ -488,6 +488,9 @@ ngx_http_do_read_upload_client_request_body(ngx_http_request_t *r)
if (rb->buf->last == rb->buf->end) { if (rb->buf->last == rb->buf->end) {
rc = ngx_http_process_request_body(r, rb->to_write); rc = ngx_http_process_request_body(r, rb->to_write);
if(rc != NGX_OK) {
return rc;
}
rb->to_write = rb->bufs->next ? rb->bufs->next : rb->bufs; rb->to_write = rb->bufs->next ? rb->bufs->next : rb->bufs;
rb->buf->last = rb->buf->start; rb->buf->last = rb->buf->start;
@@ -555,7 +558,10 @@ ngx_http_do_read_upload_client_request_body(ngx_http_request_t *r)
ngx_del_timer(c->read); ngx_del_timer(c->read);
} }
ngx_http_process_request_body(r, rb->to_write); rc = ngx_http_process_request_body(r, rb->to_write);
if(rc != NGX_OK) {
return rc;
}
return ngx_http_upload_body_handler(r); return ngx_http_upload_body_handler(r);
} }
@@ -779,7 +785,7 @@ modsecurity_read_body_cb(request_rec *r, char *buf, unsigned int length,
if (!ctx->body_pos) { if (!ctx->body_pos) {
ctx->body_pos = b->start; ctx->body_pos = b->start;
} }
if ((b->end - ctx->body_pos) > length) { if ((unsigned int)(b->end - ctx->body_pos) > length) {
ngx_memcpy(buf, (char *) ctx->body_pos, length); ngx_memcpy(buf, (char *) ctx->body_pos, length);
ctx->processed += length; ctx->processed += length;
ctx->body_pos += length; ctx->body_pos += length;