Fijxu
/
nginx-quic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge r3528: 

remove r->zero_in_uri
This commit is contained in:
Igor Sysoev 2010-06-07 12:27:06 +00:00
parent 4bda43e5b9
commit d8020e69f5
13 changed files with 17 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/http/modules/ngx_http_autoindex_module.c
View File

@ -160,10 +160,6 @@ ngx_http_autoindex_handler(ngx_http_request_t *r)
return NGX_DECLINED;
}
if (r->zero_in_uri) {
return NGX_DECLINED;
}
if (!(r->method & (NGX_HTTP_GET|NGX_HTTP_HEAD))) {
return NGX_DECLINED;
}

4
src/http/modules/ngx_http_dav_module.c
View File

@ -146,10 +146,6 @@ ngx_http_dav_handler(ngx_http_request_t *r)
ngx_int_t rc;
ngx_http_dav_loc_conf_t *dlcf;
if (r->zero_in_uri) {
return NGX_DECLINED;
}
dlcf = ngx_http_get_module_loc_conf(r, ngx_http_dav_module);
if (!(r->method & dlcf->methods)) {

4
src/http/modules/ngx_http_flv_module.c
View File

@ -80,10 +80,6 @@ ngx_http_flv_handler(ngx_http_request_t *r)
return NGX_DECLINED;
}
if (r->zero_in_uri) {
return NGX_DECLINED;
}
rc = ngx_http_discard_request_body(r);
if (rc != NGX_OK) {

4
src/http/modules/ngx_http_gzip_static_module.c
View File

@ -89,10 +89,6 @@ ngx_http_gzip_static_handler(ngx_http_request_t *r)
return NGX_DECLINED;
}
if (r->zero_in_uri) {
return NGX_DECLINED;
}
gzcf = ngx_http_get_module_loc_conf(r, ngx_http_gzip_static_module);
if (!gzcf->enable) {

4
src/http/modules/ngx_http_index_module.c
View File

@ -116,10 +116,6 @@ ngx_http_index_handler(ngx_http_request_t *r)
return NGX_DECLINED;
}
if (r->zero_in_uri) {
return NGX_DECLINED;
}
ilcf = ngx_http_get_module_loc_conf(r, ngx_http_index_module);
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);

4
src/http/modules/ngx_http_random_index_module.c
View File

@ -86,10 +86,6 @@ ngx_http_random_index_handler(ngx_http_request_t *r)
return NGX_DECLINED;
}
if (r->zero_in_uri) {
return NGX_DECLINED;
}
if (!(r->method & (NGX_HTTP_GET|NGX_HTTP_HEAD|NGX_HTTP_POST))) {
return NGX_DECLINED;
}

4
src/http/modules/ngx_http_static_module.c
View File

@ -66,10 +66,6 @@ ngx_http_static_handler(ngx_http_request_t *r)
return NGX_DECLINED;
}
if (r->zero_in_uri) {
return NGX_DECLINED;
}
log = r->connection->log;
/*

4
src/http/modules/perl/ngx_http_perl_module.c
View File

@ -168,10 +168,6 @@ ngx_http_perl_xs_init(pTHX)
static ngx_int_t
ngx_http_perl_handler(ngx_http_request_t *r)
{
if (r->zero_in_uri) {
return NGX_HTTP_NOT_FOUND;
}
ngx_http_perl_handle_request(r);
return NGX_DONE;

3
src/http/ngx_http_core_module.c
View File

@ -1305,7 +1305,7 @@ ngx_http_core_content_phase(ngx_http_request_t *r,
/* no content handler was found */
if (r->uri.data[r->uri.len - 1] == '/' && !r->zero_in_uri) {
if (r->uri.data[r->uri.len - 1] == '/') {
if (ngx_http_map_uri_to_path(r, &path, &root, 0) != NULL) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
@ -2093,7 +2093,6 @@ ngx_http_subrequest(ngx_http_request_t *r,
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http subrequest \"%V?%V\"", uri, &sr->args);
sr->zero_in_uri = (flags & NGX_HTTP_ZERO_IN_URI) != 0;
sr->subrequest_in_memory = (flags & NGX_HTTP_SUBREQUEST_IN_MEMORY) != 0;
sr->waited = (flags & NGX_HTTP_SUBREQUEST_WAITED) != 0;

49
src/http/ngx_http_parse.c
View File

@ -438,8 +438,7 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
r->plus_in_uri = 1;
break;
case '\0':
r->zero_in_uri = 1;
break;
return NGX_HTTP_PARSE_INVALID_REQUEST;
default:
state = sw_check_uri;
break;
@ -496,8 +495,7 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
r->plus_in_uri = 1;
break;
case '\0':
r->zero_in_uri = 1;
break;
return NGX_HTTP_PARSE_INVALID_REQUEST;
}
break;
@ -526,8 +524,7 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
r->complex_uri = 1;
break;
case '\0':
r->zero_in_uri = 1;
break;
return NGX_HTTP_PARSE_INVALID_REQUEST;
}
break;
@ -1202,7 +1199,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
ch = *p++;
} else if (ch == '\0') {
r->zero_in_uri = 1;
return NGX_HTTP_PARSE_INVALID_REQUEST;
}
state = quoted_state;
@ -1304,8 +1301,7 @@ ngx_http_parse_unsafe_uri(ngx_http_request_t *r, ngx_str_t *uri,
}
if (ch == '\0') {
*flags |= NGX_HTTP_ZERO_IN_URI;
continue;
goto unsafe;
}
if (ngx_path_separator(ch) && len > 2) {
@ -1449,34 +1445,19 @@ ngx_http_arg(ngx_http_request_t *r, u_char *name, size_t len, ngx_str_t *value)
void
ngx_http_split_args(ngx_http_request_t *r, ngx_str_t *uri, ngx_str_t *args)
{
u_char ch, *p, *last;
u_char *p, *last;
p = uri->data;
last = uri->data + uri->len;
last = p + uri->len;
p = ngx_strlchr(uri->data, last, '?');
args->len = 0;
if (p) {
uri->len = p - uri->data;
p++;
args->len = last - p;
args->data = p;
while (p < last) {
ch = *p++;
if (ch == '?') {
args->len = last - p;
args->data = p;
uri->len = p - 1 - uri->data;
if (ngx_strlchr(p, last, '\0') != NULL) {
r->zero_in_uri = 1;
}
return;
}
if (ch == '\0') {
r->zero_in_uri = 1;
continue;
}
} else {
args->len = 0;
}
}

5
src/http/ngx_http_request.h
View File

@ -57,7 +57,7 @@
#define NGX_HTTP_PARSE_INVALID_HEADER 13
#define NGX_HTTP_ZERO_IN_URI 1
/* unused 1 */
#define NGX_HTTP_SUBREQUEST_IN_MEMORY 2
#define NGX_HTTP_SUBREQUEST_WAITED 4
#define NGX_HTTP_LOG_UNSAFE 8
@ -430,9 +430,6 @@ struct ngx_http_request_s {
/* URI with "+" */
unsigned plus_in_uri:1;
/* URI with "\0" or "%00" */
unsigned zero_in_uri:1;
unsigned invalid_header:1;
unsigned valid_location:1;

2
src/http/ngx_http_special_response.c
View File

@ -517,8 +517,6 @@ ngx_http_send_error_page(ngx_http_request_t *r, ngx_http_err_page_t *err_page)
r->err_status = overwrite;
r->zero_in_uri = 0;
if (ngx_http_complex_value(r, &err_page->value, &uri) != NGX_OK) {
return NGX_ERROR;
}

4
src/http/ngx_http_upstream.c
View File

@ -1780,10 +1780,6 @@ ngx_http_upstream_process_headers(ngx_http_request_t *r, ngx_http_upstream_t *u)
return NGX_DONE;
}
if (flags & NGX_HTTP_ZERO_IN_URI) {
r->zero_in_uri = 1;
}
if (r->method != NGX_HTTP_HEAD) {
r->method = NGX_HTTP_GET;
}