Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 3598:8152369f7037 stable-0.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge r3528: remove r->zero_in_uri
author Igor Sysoev <igor@sysoev.ru>
date Mon, 07 Jun 2010 12:27:06 +0000
parents 28ee756697b1
children 9ccda889a355
comparison
equal deleted inserted replaced
3597:0d8b8c84bab7 3598:8152369f7037
1303 return NGX_AGAIN; 1303 return NGX_AGAIN;
1304 } 1304 }
1305 1305
1306 /* no content handler was found */ 1306 /* no content handler was found */
1307 1307
1308 if (r->uri.data[r->uri.len - 1] == '/' && !r->zero_in_uri) { 1308 if (r->uri.data[r->uri.len - 1] == '/') {
1309 1309
1310 if (ngx_http_map_uri_to_path(r, &path, &root, 0) != NULL) { 1310 if (ngx_http_map_uri_to_path(r, &path, &root, 0) != NULL) {
1311 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, 1311 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
1312 "directory index of \"%s\" is forbidden", path.data); 1312 "directory index of \"%s\" is forbidden", path.data);
1313 } 1313 }
2091 } 2091 }
2092 2092
2093 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, 2093 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
2094 "http subrequest \"%V?%V\"", uri, &sr->args); 2094 "http subrequest \"%V?%V\"", uri, &sr->args);
2095 2095
2096 sr->zero_in_uri = (flags & NGX_HTTP_ZERO_IN_URI) != 0;
2097 sr->subrequest_in_memory = (flags & NGX_HTTP_SUBREQUEST_IN_MEMORY) != 0; 2096 sr->subrequest_in_memory = (flags & NGX_HTTP_SUBREQUEST_IN_MEMORY) != 0;
2098 sr->waited = (flags & NGX_HTTP_SUBREQUEST_WAITED) != 0; 2097 sr->waited = (flags & NGX_HTTP_SUBREQUEST_WAITED) != 0;
2099 2098
2100 sr->unparsed_uri = r->unparsed_uri; 2099 sr->unparsed_uri = r->unparsed_uri;
2101 sr->method_name = ngx_http_core_get_method; 2100 sr->method_name = ngx_http_core_get_method;