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

merge r2991:

Browse source 
do not test "..." case since it's Win9x family feature only
This commit is contained in:
Igor Sysoev 2009-09-07 09:25:59 +00:00
parent 1ab7430cdb
commit 7d0fecc6cb
1 changed files with 0 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
src/http/ngx_http_parse.c
View file

@ -950,9 +950,6 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
sw_slash, sw_slash,
sw_dot, sw_dot,
sw_dot_dot, sw_dot_dot,
#if (NGX_WIN32)
sw_dot_dot_dot,
#endif
sw_quoted, sw_quoted,
sw_quoted_second sw_quoted_second
} state, quoted_state; } state, quoted_state;
@ -1154,12 +1151,6 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
goto args; goto args;
case '#': case '#':
goto done; goto done;
#if (NGX_WIN32)
case '.':
state = sw_dot_dot_dot;
*u++ = ch;
break;
#endif
case '+': case '+':
r->plus_in_uri = 1; r->plus_in_uri = 1;
default: default:
@ -1171,55 +1162,6 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
ch = *p++; ch = *p++;
break; break;
#if (NGX_WIN32)
case sw_dot_dot_dot:
if (usual[ch >> 5] & (1 << (ch & 0x1f))) {
state = sw_usual;
*u++ = ch;
ch = *p++;
break;
}
switch(ch) {
case '\\':
case '/':
state = sw_slash;
u -= 5;
if (u < r->uri.data) {
return NGX_HTTP_PARSE_INVALID_REQUEST;
}
while (*u != '/') {
u--;
}
if (u == r->uri.data) {
return NGX_HTTP_PARSE_INVALID_REQUEST;
}
while (*(u - 1) != '/') {
u--;
}
break;
case '%':
quoted_state = state;
state = sw_quoted;
break;
case '?':
r->args_start = p;
goto args;
case '#':
goto done;
case '+':
r->plus_in_uri = 1;
default:
state = sw_usual;
*u++ = ch;
break;
}
ch = *p++;
break;
#endif
case sw_quoted: case sw_quoted:
r->quoted_uri = 1; r->quoted_uri = 1;
@ -1369,20 +1311,6 @@ ngx_http_parse_unsafe_uri(ngx_http_request_t *r, ngx_str_t *uri,
if (p[0] == '.' && p[1] == '.' && ngx_path_separator(p[2])) { if (p[0] == '.' && p[1] == '.' && ngx_path_separator(p[2])) {
goto unsafe; goto unsafe;
} }
#if (NGX_WIN32)
if (len > 3) {
/* detect "/.../" */
if (p[0] == '.' && p[1] == '.' && p[2] == '.'
&& ngx_path_separator(p[3]))
{
goto unsafe;
}
}
#endif
} }
} }