From: dan Date: Tue, 13 Feb 2018 20:53:18 +0000 (+0000) Subject: Note the fact that zonefile depends on json1 in ext/zonefile/README.md. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d29881283b98cb2471a018b09b909acef81f140;p=thirdparty%2Fsqlite.git Note the fact that zonefile depends on json1 in ext/zonefile/README.md. FossilOrigin-Name: fb27d8f6a87e0dc1253622839c2164a7eb09f21fc0a16817c2ba9264561b77c2 --- diff --git a/ext/zonefile/README.md b/ext/zonefile/README.md index 1f485a5e64..941f9f0450 100644 --- a/ext/zonefile/README.md +++ b/ext/zonefile/README.md @@ -113,4 +113,8 @@ key from one of the zonefile files in the index: * Currently there is no support at all for encryption or compression. + * Zonefile currently uses json1 to parse the json argument to + zonefile_write(). And so must be used with an SQLITE_ENABLE_JSON1 + or otherwise json1-enabled SQLite. + diff --git a/manifest b/manifest index b7cd2bfc46..5f4b6606c6 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\shandling\sof\smaxAutoFrameSize\sparameter. -D 2018-02-13T20:08:47.555 +C Note\sthe\sfact\sthat\szonefile\sdepends\son\sjson1\sin\sext/zonefile/README.md. +D 2018-02-13T20:53:18.372 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in 7a3f714b4fcf793108042b7b0a5c720b0b310ec84314d61ba7f3f49f27e550ea @@ -408,7 +408,7 @@ F ext/session/test_session.c eb0bd6c1ea791c1d66ee4ef94c16500dad936386 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04 F ext/userauth/userauth.c 3410be31283abba70255d71fd24734e017a4497f -F ext/zonefile/README.md c42739c8276080be1c6d90ec47d98610af40336211dd382f87d1a8d2db7a3cdc +F ext/zonefile/README.md 1d6e7390e0428d4c26c2a5a3ff46d61a1d40872e66ae0bc86f9be214e3178b91 F ext/zonefile/zonefile.c 0e2ace4a2590b96ea1ed6ecff98af7504e6774755961e42bf982d268d5366856 F ext/zonefile/zonefile1.test 872ec8d549af0f1423601acdfe29390803fab3e14b8d5715f2f4bbd11431f1f5 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x @@ -1708,7 +1708,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 100137c7f68b2d9a329d6d43e6c0a81b6ac843678b670ab6cce5f510bc58b7a8 -R 9583ab6dfe2f7414596de2b26e5de239 +P d65e5855743534cb8db0d77d107579eae6daafc25c2f6035efa12c3ff0abbe7a +R 6bf7a2c0848174bc304e9f4757af3841 U dan -Z 59c419e27cd53a130879134eaf3f69b6 +Z 11dd7223ba0a43645e37231346215e09 diff --git a/manifest.uuid b/manifest.uuid index 549a73d660..0fcf20ebd6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d65e5855743534cb8db0d77d107579eae6daafc25c2f6035efa12c3ff0abbe7a \ No newline at end of file +fb27d8f6a87e0dc1253622839c2164a7eb09f21fc0a16817c2ba9264561b77c2 \ No newline at end of file