Skip to content

Fix of parameters sorting #8

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
ilnarb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix of parameters sorting #8

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
23 changes: 18 additions & 5 deletions ngx_http_sorted_querystring_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,22 @@ ngx_http_sorted_querystring_args_variable(ngx_http_request_t *r, ngx_http_variab
return NGX_OK;
}

static ngx_int_t
ngx_str_compare(const ngx_str_t *one, const ngx_str_t *two)
{
ngx_int_t rc;

rc = ngx_strncmp(one->data, two->data, ngx_min(one->len, two->len));
if (rc == 0) {
if (one->len < two->len) {
rc = -1;
} else if (one->len > two->len) {
rc = 1;
}
}

return rc;
}

ngx_int_t
ngx_http_sorted_querystring_cmp_parameters(const ngx_queue_t *one, const ngx_queue_t *two)
Expand All @@ -281,12 +297,9 @@ ngx_http_sorted_querystring_cmp_parameters(const ngx_queue_t *one, const ngx_que
first = ngx_queue_data(one, ngx_http_sorted_querystring_parameter_t, queue);
second = ngx_queue_data(two, ngx_http_sorted_querystring_parameter_t, queue);

rc = ngx_strncasecmp(first->key.data, second->key.data, ngx_min(first->key.len, second->key.len));
rc = ngx_str_compare(&first->key, &second->key);
if (rc == 0) {
rc = ngx_strncasecmp(first->complete.data, second->complete.data, ngx_min(first->complete.len, second->complete.len));
if (rc == 0) {
rc = -1;
}
rc = ngx_str_compare(&first->complete, &second->complete);
}

return rc;
Expand Down