Make it possible to return 507 on PUT requests to DAV #841
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pluknet
reviewed
Sep 17, 2025
There was a problem hiding this comment.
I think we could change ngx_http_read_client_request_body() error handling as well
(cc @arut) by mapping the internal error to a specific one based on ngx_errno.
Please test if it works for you.
NGX_HTTP_CONFLICT was chosen instead to match what we do for MKCOL (and on a common sense).
I still don't know how to usefully propose patches on GH interface, so it goes inline.
diff --git a/src/http/modules/ngx_http_dav_module.c b/src/http/modules/ngx_http_dav_module.c
index cfb98929e..cdebf5ffa 100644
--- a/src/http/modules/ngx_http_dav_module.c
+++ b/src/http/modules/ngx_http_dav_module.c
@@ -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;
}|
I can confirm that this patch works as expected and im able to receive 507. Should I apply it to this pull request? |
That would be nice, thank you. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes
These changes will partially fix #838. Without calling
ngx_http_dav_error, there is no chance for a 507 status code to be returned. Instead, a 500 status code is being returned when there is no more space left on the device.It is important to note that these changes will only work properly when temporary data is being written to a separate partition/disk. When the storage is full and there is a PUT request on DAV, the core part of nginx will successfully write a temporary file, and afterwards the WebDAV PUT handler will fail to rename it, returning 507 as expected. In cases where temporary data and the target location are on the same disk/partition, this fix will NOT work because nginx will fail to write the temporary file (which is handled by the core part of nginx, as far as I can see).
Also, as a disclaimer: I am not proficient with C, I am just using nginx, found this problem, and tried to find a workaround that will not break everything. That is the reason I am not proposing a complete fix. Sorry, I don't know how to fix it completely and properly. Nevertheless, I think this PR could still be useful.