github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-17 01:36:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

niginx: cosmetics: Changes CRLF to LF

Browse Source
This commit is contained in:
Felipe Zimmerle 2014-04-30 11:25:04 -07:00
parent feaf4c512b
commit 9de3bb6be7
2 changed files with 260 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

488
nginx/modsecurity/apr_bucket_nginx.c
View File

@ -1,160 +1,160 @@
#include <apr_bucket_nginx.h> #include <apr_bucket_nginx.h>
static apr_status_t nginx_bucket_read(apr_bucket *b, const char **str, static apr_status_t nginx_bucket_read(apr_bucket *b, const char **str,
apr_size_t *len, apr_read_type_e block); apr_size_t *len, apr_read_type_e block);
static void nginx_bucket_destroy(void *data); static void nginx_bucket_destroy(void *data);
static const apr_bucket_type_t apr_bucket_type_nginx = { static const apr_bucket_type_t apr_bucket_type_nginx = {
"NGINX", 5, APR_BUCKET_DATA, "NGINX", 5, APR_BUCKET_DATA,
nginx_bucket_destroy, nginx_bucket_destroy,
nginx_bucket_read, nginx_bucket_read,
apr_bucket_setaside_noop, apr_bucket_setaside_noop,
apr_bucket_shared_split, apr_bucket_shared_split,
apr_bucket_shared_copy apr_bucket_shared_copy
}; };
typedef struct apr_bucket_nginx { typedef struct apr_bucket_nginx {
apr_bucket_refcount refcount; apr_bucket_refcount refcount;
ngx_buf_t *buf; ngx_buf_t *buf;
} apr_bucket_nginx; } apr_bucket_nginx;
/* ngx_buf_t to apr_bucket */ /* ngx_buf_t to apr_bucket */
apr_bucket * apr_bucket_nginx_create(ngx_buf_t *buf, apr_bucket * apr_bucket_nginx_create(ngx_buf_t *buf,
apr_pool_t *p, apr_pool_t *p,
apr_bucket_alloc_t *list) apr_bucket_alloc_t *list)
{ {
apr_bucket *b = apr_bucket_alloc(sizeof(*b), list); apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
APR_BUCKET_INIT(b); /* link */ APR_BUCKET_INIT(b); /* link */
b->free = apr_bucket_free; b->free = apr_bucket_free;
b->list = list; b->list = list;
return apr_bucket_nginx_make(b, buf, p); return apr_bucket_nginx_make(b, buf, p);
} }
apr_bucket * apr_bucket_nginx_make(apr_bucket *b, ngx_buf_t *buf, apr_bucket * apr_bucket_nginx_make(apr_bucket *b, ngx_buf_t *buf,
apr_pool_t *pool) apr_pool_t *pool)
{ {
apr_bucket_nginx *n; apr_bucket_nginx *n;
n = apr_bucket_alloc(sizeof(*n), b->list); n = apr_bucket_alloc(sizeof(*n), b->list);
n->buf = buf; n->buf = buf;
b = apr_bucket_shared_make(b, n, 0, ngx_buf_size(buf)); b = apr_bucket_shared_make(b, n, 0, ngx_buf_size(buf));
b->type = &apr_bucket_type_nginx; b->type = &apr_bucket_type_nginx;
return b; return b;
} }
static apr_status_t nginx_bucket_read(apr_bucket *b, const char **str, static apr_status_t nginx_bucket_read(apr_bucket *b, const char **str,
apr_size_t *len, apr_read_type_e block) apr_size_t *len, apr_read_type_e block)
{ {
apr_bucket_nginx *n = b->data; apr_bucket_nginx *n = b->data;
ngx_buf_t *buf = n->buf; ngx_buf_t *buf = n->buf;
u_char *data; u_char *data;
ssize_t size; ssize_t size;
if (buf->pos == NULL && ngx_buf_size(buf) != 0) { if (buf->pos == NULL && ngx_buf_size(buf) != 0) {
data = apr_bucket_alloc(ngx_buf_size(buf), b->list); data = apr_bucket_alloc(ngx_buf_size(buf), b->list);
if (data == NULL) { if (data == NULL) {
return APR_EGENERAL; return APR_EGENERAL;
} }
size = ngx_read_file(buf->file, data, ngx_buf_size(buf), size = ngx_read_file(buf->file, data, ngx_buf_size(buf),
buf->file_pos); buf->file_pos);
if (size != ngx_buf_size(buf)) { if (size != ngx_buf_size(buf)) {
apr_bucket_free(data); apr_bucket_free(data);
return APR_EGENERAL; return APR_EGENERAL;
} }
buf->pos = data; buf->pos = data;
} }
*str = (char *)buf->pos + b->start; *str = (char *)buf->pos + b->start;
*len = b->length; *len = b->length;
return APR_SUCCESS; return APR_SUCCESS;
} }
static void nginx_bucket_destroy(void *data) static void nginx_bucket_destroy(void *data)
{ {
apr_bucket_nginx *n = data; apr_bucket_nginx *n = data;
ngx_buf_t *buf = n->buf; ngx_buf_t *buf = n->buf;
if (apr_bucket_shared_destroy(n)) { if (apr_bucket_shared_destroy(n)) {
if (!ngx_buf_in_memory(buf) && buf->pos != NULL) { if (!ngx_buf_in_memory(buf) && buf->pos != NULL) {
apr_bucket_free(buf->pos); apr_bucket_free(buf->pos);
buf->pos = NULL; buf->pos = NULL;
} }
apr_bucket_free(n); apr_bucket_free(n);
} }
} }
ngx_buf_t * apr_bucket_to_ngx_buf(apr_bucket *e, ngx_pool_t *pool) { ngx_buf_t * apr_bucket_to_ngx_buf(apr_bucket *e, ngx_pool_t *pool) {
ngx_buf_t *buf, *b; ngx_buf_t *buf, *b;
apr_bucket_nginx *n; apr_bucket_nginx *n;
ngx_uint_t len; ngx_uint_t len;
u_char *data; u_char *data;
if (e->type->is_metadata) { if (e->type->is_metadata) {
return NULL; return NULL;
} }
if (e->type == &apr_bucket_type_nginx) { if (e->type == &apr_bucket_type_nginx) {
n = e->data; n = e->data;
b = n->buf; b = n->buf;
/* whole buf */ /* whole buf */
if (e->length == (apr_size_t)ngx_buf_size(b)) { if (e->length == (apr_size_t)ngx_buf_size(b)) {
b->last_buf = 0; b->last_buf = 0;
return b; return b;
} }
buf = ngx_palloc(pool, sizeof(ngx_buf_t)); buf = ngx_palloc(pool, sizeof(ngx_buf_t));
if (buf == NULL) { if (buf == NULL) {
return NULL; return NULL;
} }
ngx_memcpy(buf, b, sizeof(ngx_buf_t)); ngx_memcpy(buf, b, sizeof(ngx_buf_t));
if (ngx_buf_in_memory(buf)) { if (ngx_buf_in_memory(buf)) {
buf->start = buf->pos = buf->pos + e->start; buf->start = buf->pos = buf->pos + e->start;
buf->end = buf->last = buf->pos + e->length; buf->end = buf->last = buf->pos + e->length;
} else { } else {
buf->pos = NULL; buf->pos = NULL;
buf->file_pos += e->start; buf->file_pos += e->start;
buf->file_last = buf->file_pos + e->length; buf->file_last = buf->file_pos + e->length;
} }
buf->last_buf = 0; buf->last_buf = 0;
return buf; return buf;
} }
if (apr_bucket_read(e, (const char **)&data, if (apr_bucket_read(e, (const char **)&data,
&len, APR_BLOCK_READ) != APR_SUCCESS) { &len, APR_BLOCK_READ) != APR_SUCCESS) {
return NULL; return NULL;
} }
buf = ngx_calloc_buf(pool); buf = ngx_calloc_buf(pool);
if (buf == NULL) { if (buf == NULL) {
return NULL; return NULL;
} }
if (e->type == &apr_bucket_type_pool) { if (e->type == &apr_bucket_type_pool) {
buf->start = data; buf->start = data;
} else if (len != 0) { } else if (len != 0) {
buf->start = ngx_palloc(pool, len); buf->start = ngx_palloc(pool, len);
ngx_memcpy(buf->start, data, len); ngx_memcpy(buf->start, data, len);
} }
buf->pos = buf->start; buf->pos = buf->start;
buf->end = buf->last = buf->start + len; buf->end = buf->last = buf->start + len;
buf->temporary = 1; buf->temporary = 1;
return buf; return buf;
} }
ngx_int_t copy_chain_to_brigade(ngx_chain_t *chain_orig, ngx_int_t copy_chain_to_brigade(ngx_chain_t *chain_orig,
apr_bucket_brigade *bb, ngx_pool_t *pool, ngx_int_t last_buf) apr_bucket_brigade *bb, ngx_pool_t *pool, ngx_int_t last_buf)
{ {
@ -189,100 +189,100 @@ ngx_int_t copy_chain_to_brigade(ngx_chain_t *chain_orig,
ngx_int_t move_chain_to_brigade(ngx_chain_t *chain_orig, ngx_int_t move_chain_to_brigade(ngx_chain_t *chain_orig,
apr_bucket_brigade *bb, ngx_pool_t *pool, ngx_int_t last_buf) apr_bucket_brigade *bb, ngx_pool_t *pool, ngx_int_t last_buf)
{ {
apr_bucket *e; apr_bucket *e;
ngx_chain_t *cl; ngx_chain_t *cl;
ngx_chain_t *chain = chain_orig; ngx_chain_t *chain = chain_orig;
while (chain) { while (chain) {
e = ngx_buf_to_apr_bucket(chain->buf, bb->p, bb->bucket_alloc); e = ngx_buf_to_apr_bucket(chain->buf, bb->p, bb->bucket_alloc);
if (e == NULL) { if (e == NULL) {
return NGX_ERROR; return NGX_ERROR;
} }
APR_BRIGADE_INSERT_TAIL(bb, e); APR_BRIGADE_INSERT_TAIL(bb, e);
if (chain->buf->last_buf) { if (chain->buf->last_buf) {
e = apr_bucket_eos_create(bb->bucket_alloc); e = apr_bucket_eos_create(bb->bucket_alloc);
APR_BRIGADE_INSERT_TAIL(bb, e); APR_BRIGADE_INSERT_TAIL(bb, e);
return NGX_OK; return NGX_OK;
} }
cl = chain; cl = chain;
chain = chain->next; chain = chain->next;
ngx_free_chain(pool, cl); ngx_free_chain(pool, cl);
} }
if (last_buf) { if (last_buf) {
e = apr_bucket_eos_create(bb->bucket_alloc); e = apr_bucket_eos_create(bb->bucket_alloc);
APR_BRIGADE_INSERT_TAIL(bb, e); APR_BRIGADE_INSERT_TAIL(bb, e);
return NGX_OK; return NGX_OK;
} }
return NGX_AGAIN; return NGX_AGAIN;
} }
ngx_int_t move_brigade_to_chain(apr_bucket_brigade *bb, ngx_int_t move_brigade_to_chain(apr_bucket_brigade *bb,
ngx_chain_t **ll, ngx_pool_t *pool) ngx_chain_t **ll, ngx_pool_t *pool)
{ {
apr_bucket *e; apr_bucket *e;
ngx_buf_t *buf; ngx_buf_t *buf;
ngx_chain_t *cl; ngx_chain_t *cl;
cl = NULL; cl = NULL;
if (APR_BRIGADE_EMPTY(bb)) { if (APR_BRIGADE_EMPTY(bb)) {
*ll = NULL; *ll = NULL;
return NGX_OK; return NGX_OK;
} }
for (e = APR_BRIGADE_FIRST(bb); for (e = APR_BRIGADE_FIRST(bb);
e != APR_BRIGADE_SENTINEL(bb); e != APR_BRIGADE_SENTINEL(bb);
e = APR_BUCKET_NEXT(e)) { e = APR_BUCKET_NEXT(e)) {
if (APR_BUCKET_IS_EOS(e)) { if (APR_BUCKET_IS_EOS(e)) {
if (cl == NULL) { if (cl == NULL) {
cl = ngx_alloc_chain_link(pool); cl = ngx_alloc_chain_link(pool);
if (cl == NULL) { if (cl == NULL) {
break; break;
} }
cl->buf = ngx_calloc_buf(pool); cl->buf = ngx_calloc_buf(pool);
if (cl->buf == NULL) { if (cl->buf == NULL) {
break; break;
} }
cl->buf->last_buf = 1; cl->buf->last_buf = 1;
cl->next = NULL; cl->next = NULL;
*ll = cl; *ll = cl;
} else { } else {
cl->next = NULL; cl->next = NULL;
cl->buf->last_buf = 1; cl->buf->last_buf = 1;
} }
apr_brigade_cleanup(bb); apr_brigade_cleanup(bb);
return NGX_OK; return NGX_OK;
} }
if (APR_BUCKET_IS_METADATA(e)) { if (APR_BUCKET_IS_METADATA(e)) {
continue; continue;
} }
buf = apr_bucket_to_ngx_buf(e, pool); buf = apr_bucket_to_ngx_buf(e, pool);
if (buf == NULL) { if (buf == NULL) {
break; break;
} }
cl = ngx_alloc_chain_link(pool); cl = ngx_alloc_chain_link(pool);
if (cl == NULL) { if (cl == NULL) {
break; break;
} }
cl->buf = buf; cl->buf = buf;
cl->next = NULL; cl->next = NULL;
*ll = cl; *ll = cl;
ll = &cl->next; ll = &cl->next;
} }
apr_brigade_cleanup(bb);
/* no eos or error */
return NGX_ERROR;
}
apr_brigade_cleanup(bb);
/* no eos or error */
return NGX_ERROR;
}

32
nginx/modsecurity/apr_bucket_nginx.h
View File

@ -1,18 +1,18 @@
#pragma once #pragma once
#include <ngx_core.h> #include <ngx_core.h>
#include "apr_buckets.h" #include "apr_buckets.h"
apr_bucket * apr_bucket_nginx_create(ngx_buf_t *buf, apr_bucket * apr_bucket_nginx_create(ngx_buf_t *buf,
apr_pool_t *p, apr_pool_t *p,
apr_bucket_alloc_t *list); apr_bucket_alloc_t *list);
apr_bucket * apr_bucket_nginx_make(apr_bucket *e, ngx_buf_t *buf, apr_bucket * apr_bucket_nginx_make(apr_bucket *e, ngx_buf_t *buf,
apr_pool_t *pool); apr_pool_t *pool);
#define ngx_buf_to_apr_bucket apr_bucket_nginx_create #define ngx_buf_to_apr_bucket apr_bucket_nginx_create
ngx_buf_t * apr_bucket_to_ngx_buf(apr_bucket *e, ngx_pool_t *pool); ngx_buf_t * apr_bucket_to_ngx_buf(apr_bucket *e, ngx_pool_t *pool);
ngx_int_t copy_chain_to_brigade(ngx_chain_t *chain_orig, ngx_int_t copy_chain_to_brigade(ngx_chain_t *chain_orig,
apr_bucket_brigade *bb, ngx_pool_t *pool, ngx_int_t last_buf); apr_bucket_brigade *bb, ngx_pool_t *pool, ngx_int_t last_buf);
@ -21,4 +21,4 @@ ngx_int_t move_chain_to_brigade(ngx_chain_t *chain, apr_bucket_brigade *bb,
ngx_int_t move_brigade_to_chain(apr_bucket_brigade *bb, ngx_chain_t **chain, ngx_int_t move_brigade_to_chain(apr_bucket_brigade *bb, ngx_chain_t **chain,
ngx_pool_t *pool); ngx_pool_t *pool);