nginx-0.3.53-RELEASE importrelease-0.3.53

    *) Change: the "add_header" directive adds the string to 204, 301, and
       302 responses.

    *) Feature: the "server" directive in the "upstream" context supports
       the "weight" parameter.

    *) Feature: the "server_name" directive supports the "*" wildcard.

    *) Feature: nginx supports the request body size more than 2G.

    *) Bugfix: if a client was successfully authorized using "satisfy_any
       on", then anyway the message "access forbidden by rule" was written
       in the log.

    *) Bugfix: the "PUT" method may erroneously not create a file and
       return the 409 code.

    *) Bugfix: if the IMAP/POP3 backend returned an error, then nginx
       continued proxying anyway.

1 files changed, 12 insertions, 9 deletions

diff --git a/src/http/modules/ngx_http_dav_module.c b/src/http/modules/ngx_http_dav_module.c
index 7f61774e7..53ef21c45 100644
--- a/src/http/modules/ngx_http_dav_module.c
+++ b/src/http/modules/ngx_http_dav_module.c
@@ -251,17 +251,20 @@ ngx_http_dav_put_handler(ngx_http_request_t *r)
 
     } else {
         status = NGX_HTTP_NO_CONTENT;
-    }
 
-    if (ngx_is_dir(&fi)) {
-        if (ngx_delete_file(temp->data) == NGX_FILE_ERROR) {
-            ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
-                          ngx_delete_file_n " \"%s\" failed",
-                          temp->data);
-        }
+        if (ngx_is_dir(&fi)) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, NGX_EISDIR,
+                          "\"%s\" could not be created", path.data);
+
+            if (ngx_delete_file(temp->data) == NGX_FILE_ERROR) {
+                ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
+                              ngx_delete_file_n " \"%s\" failed",
+                              temp->data);
+            }
 
-        ngx_http_finalize_request(r, NGX_HTTP_CONFLICT);
-        return;
+            ngx_http_finalize_request(r, NGX_HTTP_CONFLICT);
+            return;
+        }
     }
 
     if (ngx_rename_file(temp->data, path.data) != NGX_FILE_ERROR) {