From: drh <>
Date: Mon, 10 Nov 2025 10:46:55 +0000 (+0000)
Subject: Merge all the latest trunk fixes, and especially the fix for the ".www"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f863c0187c3134c3af49b4b8d84910451266c002;p=thirdparty%2Fsqlite.git

Merge all the latest trunk fixes, and especially the fix for the ".www"
command in the CLI, into the qrf branch.

FossilOrigin-Name: 07a5523cf27fd7c1d8fbc5cde80cb45fadef49317ca59fec9f8e42b2839c3e19
---

f863c0187c3134c3af49b4b8d84910451266c002
diff --cc manifest
index dc300e0608,54bfcdf842..ca5777b3c9
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fixes\sto\sautoExplain
- D 2025-11-10T00:18:36.008
 -C Reworking\sof\sJS\sinternals\sto\ssupport\sbinding\sof\snested\sC\sstructs\s(like\ssqlite3_index_constraint\sand\sfriends)\sand\sallow\ssome\sof\sthe\sautomated\sJS/C\sconversions\sto\sbe\splugged\sin\sat\sthe\sstruct-binding\slevel,\ssimplifying\show\sstruct\smembers,\sin\sparticular\sfunction\spointers,\scan\sbe\sused\sfrom\sJS.
 -D 2025-11-10T07:41:54.187
++C Merge\sall\sthe\slatest\strunk\sfixes,\sand\sespecially\sthe\sfix\sfor\sthe\s".www"\ncommand\sin\sthe\sCLI,\sinto\sthe\sqrf\sbranch.
++D 2025-11-10T10:46:55.745
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -735,8 -732,8 +735,8 @@@ F src/random.c 606b00941a1d7dd09c381d32
  F src/resolve.c 5616fbcf3b833c7c705b24371828215ad0925d0c0073216c4f153348d5753f0a
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
  F src/select.c ba9cd07ffa3277883c1986085f6ddc4320f4d35d5f212ab58df79a7ecc1a576a
- F src/shell.c.in 22b8fd9c35f3e47029ea601adba3dff7ca0e53508e7e9e7f25d18ecbd0e6123f
- F src/sqlite.h.in 43f60117ce68847b9d4e7fa43c2ac42bb324185e66b924d3114b24d4037fc263
 -F src/shell.c.in ceb0a9cc008ac82d8d2e6ef353db14a54bc40dfd60a8cfbb6bc98d071f538761
++F src/shell.c.in 1096866ed70c24b3cf66ed0d44841ba992847257667d51c6130f043661a57adc
+ F src/sqlite.h.in 7403a952a8f1239de7525b73c4e3a0f9540ec0607ed24fec887f5832642d44b8
  F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
  F src/sqlite3ext.h 7f236ca1b175ffe03316d974ef57df79b3938466c28d2f95caef5e08c57f3a52
  F src/sqliteInt.h 88f7fc9ce1630d9a5f7e0a8e1f3287cdc63882fba985c18e7eee1b9f457f59aa
@@@ -2173,8 -2167,8 +2173,8 @@@ F tool/version-info.c 33d0390ef484b3b1c
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 0ee8fc00af4c82da0d597c65dd3d8590c71ea78d8f4a29653bbb21668c6c530d
- R 1b83fc1fe906411e336c745260017220
 -P 2f918c14bac28c567cc854b3d41dcdd59191a118bb5fdea9373945fe860161f5
 -R ec4a247d32a2beb55a1852fe7b3a7b07
 -U stephan
 -Z 6d1537ab535678201b3302bce4da7f8d
++P 38e4171697057437fc9f70f8734c7f557b91da47804ff10b3d2481802377222f bb4fd5b789cebf2b224c29023fea3e620a86fb36730c36c0d85d9f35880bf643
++R 81ab1f40b9f0f7a027cb449f4a6b6756
 +U drh
- Z b43f3bd2ed19eeb9e0c51dc01284fe35
++Z 3ca265c3c4bd81ca6bd532ca63dabffd
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index e66ecc9645,963f060359..99b543edc5
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 38e4171697057437fc9f70f8734c7f557b91da47804ff10b3d2481802377222f
 -bb4fd5b789cebf2b224c29023fea3e620a86fb36730c36c0d85d9f35880bf643
++07a5523cf27fd7c1d8fbc5cde80cb45fadef49317ca59fec9f8e42b2839c3e19