Fossil SCM

Merge trunk

js 2025-06-14 20:47 morphos merge
Commit 37a48b6b92fcdfa5111adb9db1aaa4d1f3d8457bc1f45399119f3499bc841876
Parent 139b8599cde3725…
7 files changed +1 -4 +2 +1 +2 -2 +2 +2 +3 -3
~ src/fossil.numbered-lines.js ~ src/main.mk ~ tools/makemake.tcl ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.msc ~ www/sync.wiki
M src/fossil.numbered-lines.js
+1 -4
--- src/fossil.numbered-lines.js
+++ src/fossil.numbered-lines.js
@@ -21,14 +21,11 @@
2121
 const tdLn = tbl.querySelector('td.line-numbers');
2222
 const urlArgsRaw = (window.location.search||'?')
2323
 .replace(/&?\budc=[^&]*/,'') /* "update display prefs cookie" */
2424
 .replace(/&?\bln=[^&]*/,'') /* inbound line number/range */
2525
 .replace('?&','?');
26
- var urlArgsDecoded = urlArgsRaw;
27
- try{urlArgsDecoded = decodeURIComponent(urlArgsRaw);}
28
- catch{}
29
- const lineState = { urlArgs: urlArgsDecoded, start: 0, end: 0 };
26
+ const lineState = { urlArgs: urlArgsRaw, start: 0, end: 0 };
3027
 const lineTip = new F.PopupWidget({
3128
 style: {
3229
 cursor: 'pointer'
3330
 },
3431
 refresh: function(){
3532
--- src/fossil.numbered-lines.js
+++ src/fossil.numbered-lines.js
@@ -21,14 +21,11 @@
21 const tdLn = tbl.querySelector('td.line-numbers');
22 const urlArgsRaw = (window.location.search||'?')
23 .replace(/&?\budc=[^&]*/,'') /* "update display prefs cookie" */
24 .replace(/&?\bln=[^&]*/,'') /* inbound line number/range */
25 .replace('?&','?');
26 var urlArgsDecoded = urlArgsRaw;
27 try{urlArgsDecoded = decodeURIComponent(urlArgsRaw);}
28 catch{}
29 const lineState = { urlArgs: urlArgsDecoded, start: 0, end: 0 };
30 const lineTip = new F.PopupWidget({
31 style: {
32 cursor: 'pointer'
33 },
34 refresh: function(){
35
--- src/fossil.numbered-lines.js
+++ src/fossil.numbered-lines.js
@@ -21,14 +21,11 @@
21 const tdLn = tbl.querySelector('td.line-numbers');
22 const urlArgsRaw = (window.location.search||'?')
23 .replace(/&?\budc=[^&]*/,'') /* "update display prefs cookie" */
24 .replace(/&?\bln=[^&]*/,'') /* inbound line number/range */
25 .replace('?&','?');
26 const lineState = { urlArgs: urlArgsRaw, start: 0, end: 0 };
 
 
 
27 const lineTip = new F.PopupWidget({
28 style: {
29 cursor: 'pointer'
30 },
31 refresh: function(){
32
M src/main.mk
+2
--- src/main.mk
+++ src/main.mk
@@ -655,10 +655,11 @@
655655
 -DSQLITE_ENABLE_DBSTAT_VTAB \
656656
 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
657657
 -DSQLITE_ENABLE_FTS4 \
658658
 -DSQLITE_ENABLE_FTS5 \
659659
 -DSQLITE_ENABLE_MATH_FUNCTIONS \
660
+ -DSQLITE_ENABLE_SETLK_TIMEOUT \
660661
 -DSQLITE_ENABLE_STMTVTAB \
661662
 -DSQLITE_HAVE_ZLIB \
662663
 -DSQLITE_ENABLE_DBPAGE_VTAB \
663664
 -DSQLITE_TRUSTED_SCHEMA=0 \
664665
 -DHAVE_USLEEP
@@ -681,10 +682,11 @@
681682
 -DSQLITE_ENABLE_DBSTAT_VTAB \
682683
 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
683684
 -DSQLITE_ENABLE_FTS4 \
684685
 -DSQLITE_ENABLE_FTS5 \
685686
 -DSQLITE_ENABLE_MATH_FUNCTIONS \
687
+ -DSQLITE_ENABLE_SETLK_TIMEOUT \
686688
 -DSQLITE_ENABLE_STMTVTAB \
687689
 -DSQLITE_HAVE_ZLIB \
688690
 -DSQLITE_ENABLE_DBPAGE_VTAB \
689691
 -DSQLITE_TRUSTED_SCHEMA=0 \
690692
 -DHAVE_USLEEP \
691693
--- src/main.mk
+++ src/main.mk
@@ -655,10 +655,11 @@
655 -DSQLITE_ENABLE_DBSTAT_VTAB \
656 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
657 -DSQLITE_ENABLE_FTS4 \
658 -DSQLITE_ENABLE_FTS5 \
659 -DSQLITE_ENABLE_MATH_FUNCTIONS \
 
660 -DSQLITE_ENABLE_STMTVTAB \
661 -DSQLITE_HAVE_ZLIB \
662 -DSQLITE_ENABLE_DBPAGE_VTAB \
663 -DSQLITE_TRUSTED_SCHEMA=0 \
664 -DHAVE_USLEEP
@@ -681,10 +682,11 @@
681 -DSQLITE_ENABLE_DBSTAT_VTAB \
682 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
683 -DSQLITE_ENABLE_FTS4 \
684 -DSQLITE_ENABLE_FTS5 \
685 -DSQLITE_ENABLE_MATH_FUNCTIONS \
 
686 -DSQLITE_ENABLE_STMTVTAB \
687 -DSQLITE_HAVE_ZLIB \
688 -DSQLITE_ENABLE_DBPAGE_VTAB \
689 -DSQLITE_TRUSTED_SCHEMA=0 \
690 -DHAVE_USLEEP \
691
--- src/main.mk
+++ src/main.mk
@@ -655,10 +655,11 @@
655 -DSQLITE_ENABLE_DBSTAT_VTAB \
656 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
657 -DSQLITE_ENABLE_FTS4 \
658 -DSQLITE_ENABLE_FTS5 \
659 -DSQLITE_ENABLE_MATH_FUNCTIONS \
660 -DSQLITE_ENABLE_SETLK_TIMEOUT \
661 -DSQLITE_ENABLE_STMTVTAB \
662 -DSQLITE_HAVE_ZLIB \
663 -DSQLITE_ENABLE_DBPAGE_VTAB \
664 -DSQLITE_TRUSTED_SCHEMA=0 \
665 -DHAVE_USLEEP
@@ -681,10 +682,11 @@
682 -DSQLITE_ENABLE_DBSTAT_VTAB \
683 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
684 -DSQLITE_ENABLE_FTS4 \
685 -DSQLITE_ENABLE_FTS5 \
686 -DSQLITE_ENABLE_MATH_FUNCTIONS \
687 -DSQLITE_ENABLE_SETLK_TIMEOUT \
688 -DSQLITE_ENABLE_STMTVTAB \
689 -DSQLITE_HAVE_ZLIB \
690 -DSQLITE_ENABLE_DBPAGE_VTAB \
691 -DSQLITE_TRUSTED_SCHEMA=0 \
692 -DHAVE_USLEEP \
693
M tools/makemake.tcl
+1
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -245,10 +245,11 @@
245245
 -DSQLITE_ENABLE_DBSTAT_VTAB
246246
 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
247247
 -DSQLITE_ENABLE_FTS4
248248
 -DSQLITE_ENABLE_FTS5
249249
 -DSQLITE_ENABLE_MATH_FUNCTIONS
250
+ -DSQLITE_ENABLE_SETLK_TIMEOUT
250251
 -DSQLITE_ENABLE_STMTVTAB
251252
 -DSQLITE_HAVE_ZLIB
252253
 -DSQLITE_ENABLE_DBPAGE_VTAB
253254
 -DSQLITE_TRUSTED_SCHEMA=0
254255
 -DHAVE_USLEEP
255256
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -245,10 +245,11 @@
245 -DSQLITE_ENABLE_DBSTAT_VTAB
246 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
247 -DSQLITE_ENABLE_FTS4
248 -DSQLITE_ENABLE_FTS5
249 -DSQLITE_ENABLE_MATH_FUNCTIONS
 
250 -DSQLITE_ENABLE_STMTVTAB
251 -DSQLITE_HAVE_ZLIB
252 -DSQLITE_ENABLE_DBPAGE_VTAB
253 -DSQLITE_TRUSTED_SCHEMA=0
254 -DHAVE_USLEEP
255
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -245,10 +245,11 @@
245 -DSQLITE_ENABLE_DBSTAT_VTAB
246 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
247 -DSQLITE_ENABLE_FTS4
248 -DSQLITE_ENABLE_FTS5
249 -DSQLITE_ENABLE_MATH_FUNCTIONS
250 -DSQLITE_ENABLE_SETLK_TIMEOUT
251 -DSQLITE_ENABLE_STMTVTAB
252 -DSQLITE_HAVE_ZLIB
253 -DSQLITE_ENABLE_DBPAGE_VTAB
254 -DSQLITE_TRUSTED_SCHEMA=0
255 -DHAVE_USLEEP
256
M win/Makefile.dmc
+2 -2
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -26,13 +26,13 @@
2626
 CFLAGS = -o
2727
 BCC = $(DMDIR)\bin\dmc $(CFLAGS)
2828
 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
2929
 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 dnsapi
3030
31
-SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP
31
+SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_SETLK_TIMEOUT -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP
3232
33
-SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
33
+SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_SETLK_TIMEOUT -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
3434
3535
 PIKCHR_OPTIONS = -DPIKCHR_TOKEN_LIMIT=10000
3636
3737
 SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c color_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c match_.c md5_.c merge_.c merge3_.c moderate_.c name_.c patch_.c path_.c piechart_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
3838
3939
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -26,13 +26,13 @@
26 CFLAGS = -o
27 BCC = $(DMDIR)\bin\dmc $(CFLAGS)
28 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
29 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 dnsapi
30
31 SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP
32
33 SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
34
35 PIKCHR_OPTIONS = -DPIKCHR_TOKEN_LIMIT=10000
36
37 SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c color_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c match_.c md5_.c merge_.c merge3_.c moderate_.c name_.c patch_.c path_.c piechart_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
38
39
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -26,13 +26,13 @@
26 CFLAGS = -o
27 BCC = $(DMDIR)\bin\dmc $(CFLAGS)
28 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
29 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 dnsapi
30
31 SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_SETLK_TIMEOUT -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP
32
33 SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_SETLK_TIMEOUT -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
34
35 PIKCHR_OPTIONS = -DPIKCHR_TOKEN_LIMIT=10000
36
37 SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c color_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c match_.c md5_.c merge_.c merge3_.c moderate_.c name_.c patch_.c path_.c piechart_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
38
39
M win/Makefile.mingw
+2
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -2533,10 +2533,11 @@
25332533
 -DSQLITE_ENABLE_DBSTAT_VTAB \
25342534
 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
25352535
 -DSQLITE_ENABLE_FTS4 \
25362536
 -DSQLITE_ENABLE_FTS5 \
25372537
 -DSQLITE_ENABLE_MATH_FUNCTIONS \
2538
+ -DSQLITE_ENABLE_SETLK_TIMEOUT \
25382539
 -DSQLITE_ENABLE_STMTVTAB \
25392540
 -DSQLITE_HAVE_ZLIB \
25402541
 -DSQLITE_ENABLE_DBPAGE_VTAB \
25412542
 -DSQLITE_TRUSTED_SCHEMA=0 \
25422543
 -DHAVE_USLEEP \
@@ -2562,10 +2563,11 @@
25622563
 -DSQLITE_ENABLE_DBSTAT_VTAB \
25632564
 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
25642565
 -DSQLITE_ENABLE_FTS4 \
25652566
 -DSQLITE_ENABLE_FTS5 \
25662567
 -DSQLITE_ENABLE_MATH_FUNCTIONS \
2568
+ -DSQLITE_ENABLE_SETLK_TIMEOUT \
25672569
 -DSQLITE_ENABLE_STMTVTAB \
25682570
 -DSQLITE_HAVE_ZLIB \
25692571
 -DSQLITE_ENABLE_DBPAGE_VTAB \
25702572
 -DSQLITE_TRUSTED_SCHEMA=0 \
25712573
 -DHAVE_USLEEP \
25722574
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -2533,10 +2533,11 @@
2533 -DSQLITE_ENABLE_DBSTAT_VTAB \
2534 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2535 -DSQLITE_ENABLE_FTS4 \
2536 -DSQLITE_ENABLE_FTS5 \
2537 -DSQLITE_ENABLE_MATH_FUNCTIONS \
 
2538 -DSQLITE_ENABLE_STMTVTAB \
2539 -DSQLITE_HAVE_ZLIB \
2540 -DSQLITE_ENABLE_DBPAGE_VTAB \
2541 -DSQLITE_TRUSTED_SCHEMA=0 \
2542 -DHAVE_USLEEP \
@@ -2562,10 +2563,11 @@
2562 -DSQLITE_ENABLE_DBSTAT_VTAB \
2563 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2564 -DSQLITE_ENABLE_FTS4 \
2565 -DSQLITE_ENABLE_FTS5 \
2566 -DSQLITE_ENABLE_MATH_FUNCTIONS \
 
2567 -DSQLITE_ENABLE_STMTVTAB \
2568 -DSQLITE_HAVE_ZLIB \
2569 -DSQLITE_ENABLE_DBPAGE_VTAB \
2570 -DSQLITE_TRUSTED_SCHEMA=0 \
2571 -DHAVE_USLEEP \
2572
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -2533,10 +2533,11 @@
2533 -DSQLITE_ENABLE_DBSTAT_VTAB \
2534 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2535 -DSQLITE_ENABLE_FTS4 \
2536 -DSQLITE_ENABLE_FTS5 \
2537 -DSQLITE_ENABLE_MATH_FUNCTIONS \
2538 -DSQLITE_ENABLE_SETLK_TIMEOUT \
2539 -DSQLITE_ENABLE_STMTVTAB \
2540 -DSQLITE_HAVE_ZLIB \
2541 -DSQLITE_ENABLE_DBPAGE_VTAB \
2542 -DSQLITE_TRUSTED_SCHEMA=0 \
2543 -DHAVE_USLEEP \
@@ -2562,10 +2563,11 @@
2563 -DSQLITE_ENABLE_DBSTAT_VTAB \
2564 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2565 -DSQLITE_ENABLE_FTS4 \
2566 -DSQLITE_ENABLE_FTS5 \
2567 -DSQLITE_ENABLE_MATH_FUNCTIONS \
2568 -DSQLITE_ENABLE_SETLK_TIMEOUT \
2569 -DSQLITE_ENABLE_STMTVTAB \
2570 -DSQLITE_HAVE_ZLIB \
2571 -DSQLITE_ENABLE_DBPAGE_VTAB \
2572 -DSQLITE_TRUSTED_SCHEMA=0 \
2573 -DHAVE_USLEEP \
2574
M win/Makefile.msc
+2
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -316,10 +316,11 @@
316316
 /DSQLITE_ENABLE_DBSTAT_VTAB \
317317
 /DSQLITE_ENABLE_EXPLAIN_COMMENTS \
318318
 /DSQLITE_ENABLE_FTS4 \
319319
 /DSQLITE_ENABLE_FTS5 \
320320
 /DSQLITE_ENABLE_MATH_FUNCTIONS \
321
+ /DSQLITE_ENABLE_SETLK_TIMEOUT \
321322
 /DSQLITE_ENABLE_STMTVTAB \
322323
 /DSQLITE_HAVE_ZLIB \
323324
 /DSQLITE_ENABLE_DBPAGE_VTAB \
324325
 /DSQLITE_TRUSTED_SCHEMA=0 \
325326
 /DHAVE_USLEEP \
@@ -342,10 +343,11 @@
342343
 /DSQLITE_ENABLE_DBSTAT_VTAB \
343344
 /DSQLITE_ENABLE_EXPLAIN_COMMENTS \
344345
 /DSQLITE_ENABLE_FTS4 \
345346
 /DSQLITE_ENABLE_FTS5 \
346347
 /DSQLITE_ENABLE_MATH_FUNCTIONS \
348
+ /DSQLITE_ENABLE_SETLK_TIMEOUT \
347349
 /DSQLITE_ENABLE_STMTVTAB \
348350
 /DSQLITE_HAVE_ZLIB \
349351
 /DSQLITE_ENABLE_DBPAGE_VTAB \
350352
 /DSQLITE_TRUSTED_SCHEMA=0 \
351353
 /DHAVE_USLEEP \
352354
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -316,10 +316,11 @@
316 /DSQLITE_ENABLE_DBSTAT_VTAB \
317 /DSQLITE_ENABLE_EXPLAIN_COMMENTS \
318 /DSQLITE_ENABLE_FTS4 \
319 /DSQLITE_ENABLE_FTS5 \
320 /DSQLITE_ENABLE_MATH_FUNCTIONS \
 
321 /DSQLITE_ENABLE_STMTVTAB \
322 /DSQLITE_HAVE_ZLIB \
323 /DSQLITE_ENABLE_DBPAGE_VTAB \
324 /DSQLITE_TRUSTED_SCHEMA=0 \
325 /DHAVE_USLEEP \
@@ -342,10 +343,11 @@
342 /DSQLITE_ENABLE_DBSTAT_VTAB \
343 /DSQLITE_ENABLE_EXPLAIN_COMMENTS \
344 /DSQLITE_ENABLE_FTS4 \
345 /DSQLITE_ENABLE_FTS5 \
346 /DSQLITE_ENABLE_MATH_FUNCTIONS \
 
347 /DSQLITE_ENABLE_STMTVTAB \
348 /DSQLITE_HAVE_ZLIB \
349 /DSQLITE_ENABLE_DBPAGE_VTAB \
350 /DSQLITE_TRUSTED_SCHEMA=0 \
351 /DHAVE_USLEEP \
352
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -316,10 +316,11 @@
316 /DSQLITE_ENABLE_DBSTAT_VTAB \
317 /DSQLITE_ENABLE_EXPLAIN_COMMENTS \
318 /DSQLITE_ENABLE_FTS4 \
319 /DSQLITE_ENABLE_FTS5 \
320 /DSQLITE_ENABLE_MATH_FUNCTIONS \
321 /DSQLITE_ENABLE_SETLK_TIMEOUT \
322 /DSQLITE_ENABLE_STMTVTAB \
323 /DSQLITE_HAVE_ZLIB \
324 /DSQLITE_ENABLE_DBPAGE_VTAB \
325 /DSQLITE_TRUSTED_SCHEMA=0 \
326 /DHAVE_USLEEP \
@@ -342,10 +343,11 @@
343 /DSQLITE_ENABLE_DBSTAT_VTAB \
344 /DSQLITE_ENABLE_EXPLAIN_COMMENTS \
345 /DSQLITE_ENABLE_FTS4 \
346 /DSQLITE_ENABLE_FTS5 \
347 /DSQLITE_ENABLE_MATH_FUNCTIONS \
348 /DSQLITE_ENABLE_SETLK_TIMEOUT \
349 /DSQLITE_ENABLE_STMTVTAB \
350 /DSQLITE_HAVE_ZLIB \
351 /DSQLITE_ENABLE_DBPAGE_VTAB \
352 /DSQLITE_TRUSTED_SCHEMA=0 \
353 /DHAVE_USLEEP \
354
M www/sync.wiki
+3 -3
--- www/sync.wiki
+++ www/sync.wiki
@@ -150,24 +150,24 @@
150150
151151
 The client modifies the URL by appending the method name "<b>/xfer</b>"
152152
 to the end. For example, if the URL specified on the client command
153153
 line is
154154
155
-<pre>https://fossil-scm.org/fossil</pre>
155
+<pre>https://fossil-scm.org/home</pre>
156156
157157
 Then the URL that is really used to do the synchronization will
158158
 be:
159159
160
-<pre>https://fossil-scm.org/fossil/xfer</pre>
160
+<pre>https://fossil-scm.org/home/xfer</pre>
161161
162162
 <h3 id="req-format">2.2 HTTP Request Format</h3>
163163
164164
 The client always sends a POST request to the server. The
165165
 general format of the POST request is as follows:
166166
167167
 <pre>
168
-POST /fossil/xfer HTTP/1.0
168
+POST /home/xfer HTTP/1.0
169169
 Host: fossil-scm.hwaci.com:80
170170
 Content-Type: application/x-fossil
171171
 Content-Length: 4216
172172
 </pre>
173173
174174
--- www/sync.wiki
+++ www/sync.wiki
@@ -150,24 +150,24 @@
150
151 The client modifies the URL by appending the method name "<b>/xfer</b>"
152 to the end. For example, if the URL specified on the client command
153 line is
154
155 <pre>https://fossil-scm.org/fossil</pre>
156
157 Then the URL that is really used to do the synchronization will
158 be:
159
160 <pre>https://fossil-scm.org/fossil/xfer</pre>
161
162 <h3 id="req-format">2.2 HTTP Request Format</h3>
163
164 The client always sends a POST request to the server. The
165 general format of the POST request is as follows:
166
167 <pre>
168 POST /fossil/xfer HTTP/1.0
169 Host: fossil-scm.hwaci.com:80
170 Content-Type: application/x-fossil
171 Content-Length: 4216
172 </pre>
173
174
--- www/sync.wiki
+++ www/sync.wiki
@@ -150,24 +150,24 @@
150
151 The client modifies the URL by appending the method name "<b>/xfer</b>"
152 to the end. For example, if the URL specified on the client command
153 line is
154
155 <pre>https://fossil-scm.org/home</pre>
156
157 Then the URL that is really used to do the synchronization will
158 be:
159
160 <pre>https://fossil-scm.org/home/xfer</pre>
161
162 <h3 id="req-format">2.2 HTTP Request Format</h3>
163
164 The client always sends a POST request to the server. The
165 general format of the POST request is as follows:
166
167 <pre>
168 POST /home/xfer HTTP/1.0
169 Host: fossil-scm.hwaci.com:80
170 Content-Type: application/x-fossil
171 Content-Length: 4216
172 </pre>
173
174

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button