Skip to content

Do not allocate new string for common HTTP methods #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JakubOnderka wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Do not allocate new string for common HTTP methods #367

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions src/ngx_http_modsecurity_access.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,15 +212,41 @@ ngx_http_modsecurity_access_handler(ngx_http_request_t *r)
break;
}

// Do not allocate new string for common methods
const char *n_method;
switch (r->method) {
case NGX_HTTP_GET:
n_method = "GET";
break;
case NGX_HTTP_HEAD:
n_method = "HEAD";
break;
case NGX_HTTP_POST:
n_method = "POST";
break;
case NGX_HTTP_OPTIONS:
n_method = "OPTIONS";
break;
case NGX_HTTP_CONNECT:
n_method = "CONNECT";
break;
default:
n_method = ngx_str_to_char(r->method_name, r->pool);
if (n_method == (char*)-1) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
break;
}

const char *n_uri = ngx_str_to_char(r->unparsed_uri, r->pool);
const char *n_method = ngx_str_to_char(r->method_name, r->pool);
if (n_uri == (char*)-1 || n_method == (char*)-1) {
if (n_uri == (char*)-1) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
if (n_uri == NULL) {
dd("uri is of length zero");
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}

old_pool = ngx_http_modsecurity_pcre_malloc_init(r->pool);
msc_process_uri(ctx->modsec_transaction, n_uri, n_method, http_version);
ngx_http_modsecurity_pcre_malloc_done(old_pool);
Expand Down