--- a/src/server/test/webdav.c Thu Apr 21 17:16:49 2022 +0200 +++ b/src/server/test/webdav.c Sun Apr 24 18:35:44 2022 +0200 @@ -1086,12 +1086,13 @@ testutil_destroy_session(sn); } -static void init_test_webdav_method( +void init_test_webdav_method( Session **out_sn, Request **out_rq, TestIOStream **out_st, pblock **out_pb, const char *method, + const char *path, const char *request_body) { Session *sn; @@ -1102,8 +1103,8 @@ sn = testutil_session(); rq = testutil_request(sn->pool, method, "/"); - pblock_nvinsert("path", "/", rq->vars); - pblock_nvinsert("uri", "/", rq->reqpb); + pblock_nvinsert("path", path, rq->vars); + pblock_nvinsert("uri", path, rq->reqpb); st = testutil_iostream(2048, TRUE); sn->csd = (IOStream*)st; @@ -1130,7 +1131,7 @@ int ret; // Test 1 - init_test_webdav_method(&sn, &rq, &st, &pb, "PROPFIND", TEST_PROPFIND1); + init_test_webdav_method(&sn, &rq, &st, &pb, "PROPFIND", "/", TEST_PROPFIND1); ret = webdav_propfind(pb, sn, rq); @@ -1147,7 +1148,7 @@ testutil_iostream_destroy(st); // Test2 - init_test_webdav_method(&sn, &rq, &st, &pb, "PROPFIND", TEST_PROPFIND2); + init_test_webdav_method(&sn, &rq, &st, &pb, "PROPFIND", "/", TEST_PROPFIND2); ret = webdav_propfind(pb, sn, rq); @@ -1420,7 +1421,7 @@ int ret; // Test 1 - init_test_webdav_method(&sn, &rq, &st, &pb, "PROPPATCH", TEST_PROPPATCH2); + init_test_webdav_method(&sn, &rq, &st, &pb, "PROPPATCH", "/", TEST_PROPPATCH2); rq->davCollection = &backend1; ret = webdav_proppatch(pb, sn, rq); @@ -1584,7 +1585,7 @@ // behaves the same for both operations // the only difference are the callbacks - init_test_webdav_method(&sn, &rq, &st, &pb, "MKCOL", NULL); + init_test_webdav_method(&sn, &rq, &st, &pb, "MKCOL", "/", NULL); VFS *testvfs = testvfs_create(sn); rq->vfs = testvfs; @@ -1667,7 +1668,7 @@ TestIOStream *st; pblock *pb; - init_test_webdav_method(&sn, &rq, &st, &pb, "DELETE", NULL); + init_test_webdav_method(&sn, &rq, &st, &pb, "DELETE", "/", NULL); rq->vfs = testvfs_create(sn); WebdavBackend dav1; @@ -1735,7 +1736,7 @@ const char *content_const = "Hello World"; - init_test_webdav_method(&sn, &rq, &st, &pb, "PUT", content_const); + init_test_webdav_method(&sn, &rq, &st, &pb, "PUT", "/", content_const); rq->vfs = testvfs_create(sn); UCX_TEST_BEGIN;