Mercurial > hg > nginx-quic
comparison src/http/ngx_http_request.c @ 3435:d65ba5392f59 stable-0.7
merge r3138, r3139, r3157, r3158, r3159, r3164, r3165,
r3202, r3203, r3383, r3388, r3417, r3418:
Win32 (mostly) and some Unix file related fixes:
*) preserve errno while ngx_free()
*) win32 ngx_file_info() utf8 support
*) delete Win95 code
*) log file name for read/write errors
*) test incomplete WriteFile()
*) handle short pwrite() to log an error cause: ENOSPC, EDQUOT, or EFBIG
*) uniform ngx_directio_on/off() interface with other file functions
*) do not create Win32 drive letter in ngx_create_full_path()
*) ignore EACCES errors for top level directories in ngx_create_full_path()
*) fix Win32 error messages when an temporary file replaces an existent file:
*) do not rename an already renamed file
*) now ngx_win32_rename_file() returns error code
*) do not log failure inside ngx_win32_rename_file()
*) fix Win32 error message when an temporary file replaces an existent file:
return at once if ngx_win32_rename_file() was not failed
and do not try to delete already the renamed temporary file
*) skip URI trailing spaces under Win32
*) disable Win32 short file names
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 01 Feb 2010 15:06:25 +0000 |
parents | 612436ad775a |
children | 5d9ff79eab6f |
comparison
equal
deleted
inserted
replaced
3434:8d310fbeaa38 | 3435:d65ba5392f59 |
---|---|
782 { | 782 { |
783 u_char *p; | 783 u_char *p; |
784 | 784 |
785 p = r->uri.data + r->uri.len - 1; | 785 p = r->uri.data + r->uri.len - 1; |
786 | 786 |
787 if (*p == '.') { | 787 if (*p == '.' || *p == ' ') { |
788 | 788 |
789 while (--p > r->uri.data && *p == '.') { /* void */ } | 789 while (--p > r->uri.data && (*p == '.' || *p == ' ')) { |
790 /* void */ | |
791 } | |
790 | 792 |
791 r->uri.len = p + 1 - r->uri.data; | 793 r->uri.len = p + 1 - r->uri.data; |
792 | 794 |
793 ngx_http_set_exten(r); | 795 ngx_http_set_exten(r); |
794 } | 796 } |