diff options
author | Maxim Dounin <mdounin@mdounin.ru> | 2013-09-23 19:37:13 +0400 |
---|---|---|
committer | Maxim Dounin <mdounin@mdounin.ru> | 2013-09-23 19:37:13 +0400 |
commit | e11584164f787095e99e6759f2f6e16e24683855 (patch) | |
tree | a09603e9e0a7e702f853027ef71a3b0772098343 /src/os/unix/ngx_files.h | |
parent | d2ef70e97acbda42204d589d0886be88314016c2 (diff) | |
download | nginx-e11584164f787095e99e6759f2f6e16e24683855.tar.gz nginx-e11584164f787095e99e6759f2f6e16e24683855.zip |
Added ngx_filename_cmp() with "/" sorted to the left.
This patch fixes incorrect handling of auto redirect in configurations
like:
location /0 { }
location /a- { }
location /a/ { proxy_pass ... }
With previously used sorting, this resulted in the following locations
tree (as "-" is less than "/"):
"/a-"
"/0" "/a/"
and a request to "/a" didn't match "/a/" with auto_redirect, as it
didn't traverse relevant tree node during lookup (it tested "/a-",
then "/0", and then falled back to null location).
To preserve locale use for non-ASCII characters on case-insensetive
systems, libc's tolower() used.
Diffstat (limited to 'src/os/unix/ngx_files.h')
-rw-r--r-- | src/os/unix/ngx_files.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h index df759df52..4b2016500 100644 --- a/src/os/unix/ngx_files.h +++ b/src/os/unix/ngx_files.h @@ -192,17 +192,6 @@ ngx_int_t ngx_create_file_mapping(ngx_file_mapping_t *fm); void ngx_close_file_mapping(ngx_file_mapping_t *fm); -#if (NGX_HAVE_CASELESS_FILESYSTEM) - -#define ngx_filename_cmp(s1, s2, n) strncasecmp((char *) s1, (char *) s2, n) - -#else - -#define ngx_filename_cmp ngx_memcmp - -#endif - - #define ngx_realpath(p, r) (u_char *) realpath((char *) p, (char *) r) #define ngx_realpath_n "realpath()" #define ngx_getcwd(buf, size) (getcwd((char *) buf, size) != NULL) |