mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-18 10:16:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Caseless location tree construction (ticket #90).

Browse Source 
Location tree was always constructed using case-sensitive comparison, even
on case-insensitive systems.  This resulted in incorrect operation if
uppercase letters were used in location directives.  Notably, the
following config:

    location /a { ... }
    location /B { ... }

failed to properly map requests to "/B" into "location /B".
This commit is contained in:
Maxim Dounin 2013-09-23 19:37:06 +04:00
parent f52a2c7585
commit d2ef70e97a
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/http/ngx_http.c
View File

@ -949,7 +949,8 @@ ngx_http_cmp_locations(const ngx_queue_t *one, const ngx_queue_t *two)
#endif #endif
rc = ngx_strcmp(first->name.data, second->name.data); rc = ngx_filename_cmp(first->name.data, second->name.data,
ngx_min(first->name.len, second->name.len) + 1);
if (rc == 0 && !first->exact_match && second->exact_match) { if (rc == 0 && !first->exact_match && second->exact_match) {
/* an exact match must be before the same inclusive one */ /* an exact match must be before the same inclusive one */
@ -975,8 +976,10 @@ ngx_http_join_exact_locations(ngx_conf_t *cf, ngx_queue_t *locations)
lq = (ngx_http_location_queue_t *) q; lq = (ngx_http_location_queue_t *) q;
lx = (ngx_http_location_queue_t *) x; lx = (ngx_http_location_queue_t *) x;
if (ngx_strcmp(lq->name->data, lx->name->data) == 0) { if (lq->name->len == lx->name->len
&& ngx_filename_cmp(lq->name->data, lx->name->data, lx->name->len)
== 0)
{
if ((lq->exact && lx->exact) || (lq->inclusive && lx->inclusive)) { if ((lq->exact && lx->exact) || (lq->inclusive && lx->inclusive)) {
ngx_log_error(NGX_LOG_EMERG, cf->log, 0, ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
"duplicate location \"%V\" in %s:%ui", "duplicate location \"%V\" in %s:%ui",
@ -1028,7 +1031,7 @@ ngx_http_create_locations_list(ngx_queue_t *locations, ngx_queue_t *q)
lx = (ngx_http_location_queue_t *) x; lx = (ngx_http_location_queue_t *) x;
if (len > lx->name->len if (len > lx->name->len
|| (ngx_strncmp(name, lx->name->data, len) != 0)) || ngx_filename_cmp(name, lx->name->data, len) != 0)
{ {
break; break;
} }

4
src/http/ngx_http_core_module.c
View File

@ -3219,9 +3219,9 @@ ngx_http_core_location(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
#if (NGX_PCRE) #if (NGX_PCRE)
if (clcf->regex == NULL if (clcf->regex == NULL
&& ngx_strncmp(clcf->name.data, pclcf->name.data, len) != 0) && ngx_filename_cmp(clcf->name.data, pclcf->name.data, len) != 0)
#else #else
if (ngx_strncmp(clcf->name.data, pclcf->name.data, len) != 0) if (ngx_filename_cmp(clcf->name.data, pclcf->name.data, len) != 0)
#endif #endif
{ {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,