Mercurial > hg > nginx-ranges
comparison src/http/modules/ngx_http_static_module.c @ 635:e67b227c8dbb default tip
Merge with current.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 25 Apr 2011 04:07:55 +0400 |
parents | ff463db0be31 |
children |
comparison
equal
deleted
inserted
replaced
578:f3a9e57d2e17 | 635:e67b227c8dbb |
---|---|
64 | 64 |
65 if (r->uri.data[r->uri.len - 1] == '/') { | 65 if (r->uri.data[r->uri.len - 1] == '/') { |
66 return NGX_DECLINED; | 66 return NGX_DECLINED; |
67 } | 67 } |
68 | 68 |
69 if (r->zero_in_uri) { | |
70 return NGX_DECLINED; | |
71 } | |
72 | |
73 log = r->connection->log; | 69 log = r->connection->log; |
74 | 70 |
75 /* | 71 /* |
76 * ngx_http_map_uri_to_path() allocates memory for terminating '\0' | 72 * ngx_http_map_uri_to_path() allocates memory for terminating '\0' |
77 * so we do not need to reserve memory for '/' for possible redirect | 73 * so we do not need to reserve memory for '/' for possible redirect |
187 } | 183 } |
188 | 184 |
189 #if !(NGX_WIN32) /* the not regular files are probably Unix specific */ | 185 #if !(NGX_WIN32) /* the not regular files are probably Unix specific */ |
190 | 186 |
191 if (!of.is_file) { | 187 if (!of.is_file) { |
192 ngx_log_error(NGX_LOG_CRIT, log, ngx_errno, | 188 ngx_log_error(NGX_LOG_CRIT, log, 0, |
193 "\"%s\" is not a regular file", path.data); | 189 "\"%s\" is not a regular file", path.data); |
194 | 190 |
195 return NGX_HTTP_NOT_FOUND; | 191 return NGX_HTTP_NOT_FOUND; |
196 } | 192 } |
197 | 193 |