Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 3527:84905c7b2aa7
remove r->zero_in_uri
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 24 May 2010 12:35:10 +0000 |
parents | dd1570b6f237 |
children | beca01195937 |
comparison
equal
deleted
inserted
replaced
3526:62a4fd1e6e2c | 3527:84905c7b2aa7 |
---|---|
1339 return NGX_AGAIN; | 1339 return NGX_AGAIN; |
1340 } | 1340 } |
1341 | 1341 |
1342 /* no content handler was found */ | 1342 /* no content handler was found */ |
1343 | 1343 |
1344 if (r->uri.data[r->uri.len - 1] == '/' && !r->zero_in_uri) { | 1344 if (r->uri.data[r->uri.len - 1] == '/') { |
1345 | 1345 |
1346 if (ngx_http_map_uri_to_path(r, &path, &root, 0) != NULL) { | 1346 if (ngx_http_map_uri_to_path(r, &path, &root, 0) != NULL) { |
1347 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | 1347 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
1348 "directory index of \"%s\" is forbidden", path.data); | 1348 "directory index of \"%s\" is forbidden", path.data); |
1349 } | 1349 } |
2102 } | 2102 } |
2103 | 2103 |
2104 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, | 2104 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, |
2105 "http subrequest \"%V?%V\"", uri, &sr->args); | 2105 "http subrequest \"%V?%V\"", uri, &sr->args); |
2106 | 2106 |
2107 sr->zero_in_uri = (flags & NGX_HTTP_ZERO_IN_URI) != 0; | |
2108 sr->subrequest_in_memory = (flags & NGX_HTTP_SUBREQUEST_IN_MEMORY) != 0; | 2107 sr->subrequest_in_memory = (flags & NGX_HTTP_SUBREQUEST_IN_MEMORY) != 0; |
2109 sr->waited = (flags & NGX_HTTP_SUBREQUEST_WAITED) != 0; | 2108 sr->waited = (flags & NGX_HTTP_SUBREQUEST_WAITED) != 0; |
2110 | 2109 |
2111 sr->unparsed_uri = r->unparsed_uri; | 2110 sr->unparsed_uri = r->unparsed_uri; |
2112 sr->method_name = ngx_http_core_get_method; | 2111 sr->method_name = ngx_http_core_get_method; |