Mercurial > hg > nginx
comparison src/http/ngx_http_request.c @ 3094:501fd3ae3188 stable-0.7
merge r2980, r2981, r2982:
win32 fixes:
*) ngx_http_set_exten() is always successful since 0.3.46
*) skip URI trailing dots under Win32
*) use caseless regex locations on caseless filesystems: MacOSX, Win32, Cygwin
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 07 Sep 2009 10:01:26 +0000 |
| parents | 19f9a5eae383 |
| children | d41c740f55ce |
comparison
equal
deleted
inserted
replaced
| 3093:5795b2710eef | 3094:501fd3ae3188 |
|---|---|
| 761 if (r->args_start && r->uri_end > r->args_start) { | 761 if (r->args_start && r->uri_end > r->args_start) { |
| 762 r->args.len = r->uri_end - r->args_start; | 762 r->args.len = r->uri_end - r->args_start; |
| 763 r->args.data = r->args_start; | 763 r->args.data = r->args_start; |
| 764 } | 764 } |
| 765 | 765 |
| 766 #if (NGX_WIN32) | |
| 767 { | |
| 768 u_char *p; | |
| 769 | |
| 770 p = r->uri.data + r->uri.len - 1; | |
| 771 | |
| 772 if (*p == '.') { | |
| 773 | |
| 774 while (--p > r->uri.data && *p == '.') { /* void */ } | |
| 775 | |
| 776 r->uri.len = p + 1 - r->uri.data; | |
| 777 | |
| 778 ngx_http_set_exten(r); | |
| 779 } | |
| 780 } | |
| 781 #endif | |
| 766 | 782 |
| 767 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, | 783 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, |
| 768 "http request line: \"%V\"", &r->request_line); | 784 "http request line: \"%V\"", &r->request_line); |
| 769 | 785 |
| 770 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, | 786 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, |