Skip to content

Commit 048232c

Browse files
committed
bump web_vfs and passthrough web_insecure
1 parent 3b16451 commit 048232c

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ include_directories(${sqlitecpp_SOURCE_DIR}/include)
2929
FetchContent_Declare(
3030
sqlite_web_vfs
3131
GIT_REPOSITORY https://github.com/mlin/sqlite_web_vfs.git
32-
GIT_TAG 818e4c2
32+
GIT_TAG fe9bced
3333
)
3434
FetchContent_MakeAvailable(sqlite_web_vfs)
3535
FetchContent_MakeAvailable(concurrentqueue)

src/SQLiteNestedVFS.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,15 +1055,16 @@ class VFS : public SQLiteVFS::Wrapper {
10551055
std::string outer_db_uri = "file:" + urlencode(outer_db_filename, true);
10561056
bool unsafe = sqlite3_uri_boolean(zName, "outer_unsafe", 0);
10571057
if (web) {
1058-
outer_db_uri += "?immutable=1&web_url=";
1059-
outer_db_uri += urlencode(sqlite3_uri_parameter(zName, "web_url"));
1058+
outer_db_uri += "?immutable=1";
1059+
for (const char *passthrough : {"web_log", "web_insecure", "web_url"}) {
1060+
if (sqlite3_uri_parameter(zName, passthrough)) {
1061+
outer_db_uri += std::string("&") + passthrough + std::string("=") +
1062+
urlencode(sqlite3_uri_parameter(zName, passthrough));
1063+
}
1064+
}
10601065
flags &= ~(SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE);
10611066
flags |= SQLITE_OPEN_READONLY;
10621067
vfs = "web";
1063-
if (sqlite3_uri_parameter(zName, "web_log")) {
1064-
outer_db_uri +=
1065-
"?web_log=" + urlencode(sqlite3_uri_parameter(zName, "web_log"));
1066-
}
10671068
} else if (unsafe) {
10681069
outer_db_uri += "?nolock=1&psow=1";
10691070
} else if (sqlite3_uri_boolean(zName, "immutable", 0)) {

0 commit comments

Comments
 (0)