Fix DAV extention

Source: arut/nginx-dav-ext-module#46 arut/nginx-dav-ext-module#56 arut/nginx-dav-ext-module#62 mid1221213/nginx-dav-ext-module@74a23a6
u-sb · Dec 14, 2024 · 7ff8193 · 7ff8193
1 parent a49f399
commit 7ff8193
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/debian/modules/http-dav-ext/ngx_http_dav_ext_module.c b/debian/modules/http-dav-ext/ngx_http_dav_ext_module.c
@@ -502,8 +502,8 @@ ngx_http_dav_ext_content_handler(ngx_http_request_t *r)
         }
 
         ngx_str_set(&h->key, "DAV");
-        h->value.len = 1;
-        h->value.data = (u_char *) (dlcf->shm_zone ? "2" : "1");
+        h->value.len = dlcf->shm_zone ? 3 : 1;
+        h->value.data = (u_char *) (dlcf->shm_zone ? "1,2" : "1");
         h->hash = 1;
 
         h = ngx_list_push(&r->headers_out.headers);
@@ -862,7 +862,7 @@ ngx_http_dav_ext_propfind(ngx_http_request_t *r, ngx_uint_t props)
         name.len = ngx_de_namelen(&dir);
         name.data = ngx_de_name(&dir);
 
-        if (name.data[0] == '.') {
+        if ((name.len == 1 && name.data[0] == '.') || (name.len == 2 && name.data[0] == '.' && name.data[1] == '.')) {
             continue;
         }
 
@@ -896,10 +896,9 @@ ngx_http_dav_ext_propfind(ngx_http_request_t *r, ngx_uint_t props)
             ngx_cpystrn(last, name.data, name.len + 1);
 
             if (ngx_de_info(filename, &dir) == NGX_FILE_ERROR) {
-                ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, ngx_errno,
                               ngx_de_info_n " \"%s\" failed", filename);
-                rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
-                break;
+                continue;
             }
         }
 
@@ -1350,7 +1349,7 @@ ngx_http_dav_ext_unlock_handler(ngx_http_request_t *r)
 
     if (node == NULL || node->token != token) {
         ngx_shmtx_unlock(&lock->shpool->mutex);
-        return NGX_HTTP_NO_CONTENT;
+        return NGX_HTTP_PRECONDITION_FAILED;
     }
 
     ngx_queue_remove(&node->queue);