mirror
/
nginx
mirror of https://github.com/nginx/nginx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge ade4647f7b into c70457482c

This commit is contained in:
Matvei M 2025-12-09 22:02:06 +00:00 committed by GitHub
parent c70457482c ade4647f7b
commit d690a5a280
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,6 +175,11 @@ ngx_http_dav_handler(ngx_http_request_t *r)
rc = ngx_http_read_client_request_body(r, ngx_http_dav_put_handler);
if (rc == NGX_HTTP_INTERNAL_SERVER_ERROR) {
return ngx_http_dav_error(NULL, ngx_errno, NGX_HTTP_CONFLICT,
NULL, NULL);
}
if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
return rc;
}
@ -207,6 +212,7 @@ ngx_http_dav_put_handler(ngx_http_request_t *r)
{
size_t root;
time_t date;
ngx_int_t rc;
ngx_str_t *temp, path;
ngx_uint_t status;
ngx_file_info_t fi;
@ -280,7 +286,8 @@ ngx_http_dav_put_handler(ngx_http_request_t *r)
}
if (ngx_ext_rename_file(temp, &path, &ext) != NGX_OK) {
ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
rc = ngx_http_dav_error(NULL, ngx_errno, NGX_HTTP_CONFLICT, NULL, NULL);
ngx_http_finalize_request(r, rc);
return;
}
@ -1063,7 +1070,9 @@ ngx_http_dav_error(ngx_log_t *log, ngx_err_t err, ngx_int_t not_found,
rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
}
ngx_log_error(level, log, err, "%s \"%s\" failed", failed, path);
if (log) {
ngx_log_error(level, log, err, "%s \"%s\" failed", failed, path);
}
return rc;
}