mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-01 03:17:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

test URI/Destination collection/non-collection and Depth

Browse Source
This commit is contained in:
Igor Sysoev 2008-01-03 20:09:51 +00:00
parent 59781d66ce
commit 58d04fe3fa
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -631,7 +631,7 @@ ngx_http_dav_copy_move_handler(ngx_http_request_t *r)
if (ngx_strncmp(desthost, host->value.data, len) != 0) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"Destination URI \"%V\" is handled by "
"\"Destination\" URI \"%V\" is handled by "
"different repository than the source URI",
&dest->value);
return NGX_HTTP_BAD_REQUEST;
@ -654,10 +654,32 @@ invalid_destination:
destination_done:
depth = ngx_http_dav_depth(r, 0);
if ((r->uri.data[r->uri.len - 1] == '/' && *(last - 1) != '/')
|| (r->uri.data[r->uri.len - 1] != '/' && *(last - 1) == '/'))
{
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"both URI \"%V\" and \"Destination\" URI \"%V\" "
"should be either collections or non-collections",
&r->uri, &dest->value);
return NGX_HTTP_CONFLICT;
}
if (depth != 0 && depth != NGX_HTTP_DAV_INFINITY_DEPTH) {
return NGX_HTTP_BAD_REQUEST;
depth = ngx_http_dav_depth(r, NGX_HTTP_DAV_INFINITY_DEPTH);
if (depth != NGX_HTTP_DAV_INFINITY_DEPTH) {
if (r->method == NGX_HTTP_COPY) {
if (depth != 0) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"\"Depth\" header must be 0 or infinity");
return NGX_HTTP_BAD_REQUEST;
}
} else {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"\"Depth\" header must be infinity");
return NGX_HTTP_BAD_REQUEST;
}
}
over = r->headers_in.overwrite;