Mercurial > hg > webserver / changeset

--- a/src/server/plugins/postgresql/vfs.c	Wed Aug 10 20:56:24 2022 +0200
+++ b/src/server/plugins/postgresql/vfs.c	Wed Aug 10 21:01:54 2022 +0200
@@ -147,11 +147,18 @@
 }
 
 VFS* pg_vfs_create(Session *sn, Request *rq, pblock *pb, void *initData) {
-    // resourcepool is required
-    char *resource_pool = pblock_findval("resourcepool", pb);
-    if(!resource_pool) {
-        log_ereport(LOG_MISCONFIG, "pg_vfs_create: missing resourcepool parameter");
-        return NULL;
+    PgRepository *repo = initData;
+    
+    char *resource_pool;
+    if(repo) {
+        resource_pool = repo->resourcepool.ptr;
+    } else {
+        // resourcepool is required
+        resource_pool = pblock_findval("resourcepool", pb);
+        if(!resource_pool) {
+            log_ereport(LOG_MISCONFIG, "pg_vfs_create: missing resourcepool parameter");
+            return NULL;
+        }
     }
     
     // get the resource first (most likely to fail due to misconfig)

--- a/src/server/plugins/postgresql/webdav.c	Wed Aug 10 20:56:24 2022 +0200
+++ b/src/server/plugins/postgresql/webdav.c	Wed Aug 10 21:01:54 2022 +0200
@@ -275,11 +275,18 @@
 }
 
 WebdavBackend* pg_webdav_create(Session *sn, Request *rq, pblock *pb, void *initData) {
-    // resourcepool is required
-    char *resource_pool = pblock_findval("resourcepool", pb);
-    if(!resource_pool) {
-        log_ereport(LOG_MISCONFIG, "pg_webdav_create: missing resourcepool parameter");
-        return NULL;
+    PgRepository *repo = initData;
+    
+    char *resource_pool;
+    if(repo) {
+        resource_pool = repo->resourcepool.ptr;
+    } else {
+        // resourcepool is required
+        resource_pool = pblock_findval("resourcepool", pb);
+        if(!resource_pool) {
+            log_ereport(LOG_MISCONFIG, "pg_webdav_create: missing resourcepool parameter");
+            return NULL;
+        }
     }
     
     // get the resource first (should only fail in case of misconfig)