Fossil SCM

Update to Fossil 2.7

jan.nijtmans 2018-09-22 19:37 openssl-1.1 merge
Commit 9d067b61eba052df13fc3828d83a05cc74b520c4e1230544382e21ce5aba4e7e
Parent 9e03e5136101b96…
13 files changed +4 -2 +10 -3 +1 -1 +32 -73 +32 -73 +39 -9 +1 -1 +16 -8 +3 -3 +32 -73 +32 -73 +9 -5 +1 -1
~ skins/default/css.txt ~ skins/default/js.txt ~ src/default_css.txt ~ src/makemake.tcl ~ src/makemake.tcl ~ src/markdown_html.c ~ src/sitemap.c ~ src/sqlite3.c ~ src/sqlite3.h ~ win/Makefile.msc ~ win/Makefile.msc ~ www/changes.wiki ~ www/index.wiki
M skins/default/css.txt
+4 -2
--- skins/default/css.txt
+++ skins/default/css.txt
@@ -143,14 +143,16 @@
143143
 overflow: auto;
144144
 border: 1px solid #ccc;
145145
 border-radius: 5px;
146146
 }
147147
 .content blockquote {
148
+ padding: 0 15px;
149
+}
150
+div.forumHierRoot blockquote, div.forumHier blockquote {
148151
 background-color: rgba(65, 131, 196, 0.1);
149152
 border-left: 3px solid #254769;
150
- padding: 0.1em;
151
- padding-left: 1em;
153
+ padding: .1em 1em;
152154
 }
153155
154156
 table.report {
155157
 cursor: auto;
156158
 border-radius: 5px;
157159
--- skins/default/css.txt
+++ skins/default/css.txt
@@ -143,14 +143,16 @@
143 overflow: auto;
144 border: 1px solid #ccc;
145 border-radius: 5px;
146 }
147 .content blockquote {
 
 
 
148 background-color: rgba(65, 131, 196, 0.1);
149 border-left: 3px solid #254769;
150 padding: 0.1em;
151 padding-left: 1em;
152 }
153
154 table.report {
155 cursor: auto;
156 border-radius: 5px;
157
--- skins/default/css.txt
+++ skins/default/css.txt
@@ -143,14 +143,16 @@
143 overflow: auto;
144 border: 1px solid #ccc;
145 border-radius: 5px;
146 }
147 .content blockquote {
148 padding: 0 15px;
149 }
150 div.forumHierRoot blockquote, div.forumHier blockquote {
151 background-color: rgba(65, 131, 196, 0.1);
152 border-left: 3px solid #254769;
153 padding: .1em 1em;
 
154 }
155
156 table.report {
157 cursor: auto;
158 border-radius: 5px;
159
M skins/default/js.txt
+10 -3
--- skins/default/js.txt
+++ skins/default/js.txt
@@ -18,12 +18,19 @@
1818
 ** menu button.
1919
 */
2020
 (function() {
2121
 var panel = document.getElementById("hbdrop");
2222
 if (!panel) return; // site admin might've nuked it
23
+ if (!panel.style) return; // shouldn't happen, but be sure
2324
 var panelBorder = panel.style.border;
24
- var animate = panel.style.hasOwnProperty('transition');
25
+
26
+ // Disable animation if this browser doesn't support CSS transitions.
27
+ //
28
+ // We need this ugly calling form for old browsers that don't allow
29
+ // panel.style.hasOwnProperty('transition'); catering to old browsers
30
+ // is the whole point here.
31
+ var animate = panel.style.transition !== null && (typeof(panel.style.transition) == "string");
2532
 var animMS = 400;
2633
2734
 // Calculate panel height despite its being hidden at call time.
2835
 // Based on https://stackoverflow.com/a/29047447/142454
2936
 var panelHeight; // computed on sitemap load
@@ -123,15 +130,15 @@
123130
 panel.style.display = 'block';
124131
 }
125132
 }
126133
 // else, can't parse response as HTML or XML
127134
 }
128
- xhr.open("POST", "$home/sitemap"); // note the TH1 substitution!
135
+ xhr.open("GET", "$home/sitemap?popup"); // note the TH1 substitution!
129136
 xhr.responseType = "document";
130
- xhr.send("popup=1");
137
+ xhr.send();
131138
 }
132139
 else {
133140
 showPanel(); // just show what we built above
134141
 }
135142
 return false; // prevent browser from acting on <a> click
136143
 }
137144
 })();
138145
--- skins/default/js.txt
+++ skins/default/js.txt
@@ -18,12 +18,19 @@
18 ** menu button.
19 */
20 (function() {
21 var panel = document.getElementById("hbdrop");
22 if (!panel) return; // site admin might've nuked it
 
23 var panelBorder = panel.style.border;
24 var animate = panel.style.hasOwnProperty('transition');
 
 
 
 
 
 
25 var animMS = 400;
26
27 // Calculate panel height despite its being hidden at call time.
28 // Based on https://stackoverflow.com/a/29047447/142454
29 var panelHeight; // computed on sitemap load
@@ -123,15 +130,15 @@
123 panel.style.display = 'block';
124 }
125 }
126 // else, can't parse response as HTML or XML
127 }
128 xhr.open("POST", "$home/sitemap"); // note the TH1 substitution!
129 xhr.responseType = "document";
130 xhr.send("popup=1");
131 }
132 else {
133 showPanel(); // just show what we built above
134 }
135 return false; // prevent browser from acting on <a> click
136 }
137 })();
138
--- skins/default/js.txt
+++ skins/default/js.txt
@@ -18,12 +18,19 @@
18 ** menu button.
19 */
20 (function() {
21 var panel = document.getElementById("hbdrop");
22 if (!panel) return; // site admin might've nuked it
23 if (!panel.style) return; // shouldn't happen, but be sure
24 var panelBorder = panel.style.border;
25
26 // Disable animation if this browser doesn't support CSS transitions.
27 //
28 // We need this ugly calling form for old browsers that don't allow
29 // panel.style.hasOwnProperty('transition'); catering to old browsers
30 // is the whole point here.
31 var animate = panel.style.transition !== null && (typeof(panel.style.transition) == "string");
32 var animMS = 400;
33
34 // Calculate panel height despite its being hidden at call time.
35 // Based on https://stackoverflow.com/a/29047447/142454
36 var panelHeight; // computed on sitemap load
@@ -123,15 +130,15 @@
130 panel.style.display = 'block';
131 }
132 }
133 // else, can't parse response as HTML or XML
134 }
135 xhr.open("GET", "$home/sitemap?popup"); // note the TH1 substitution!
136 xhr.responseType = "document";
137 xhr.send();
138 }
139 else {
140 showPanel(); // just show what we built above
141 }
142 return false; // prevent browser from acting on <a> click
143 }
144 })();
145
M src/default_css.txt
+1 -1
--- src/default_css.txt
+++ src/default_css.txt
@@ -195,11 +195,11 @@
195195
 padding: 0 0 0 1em;
196196
 }
197197
 div.columns > ul li:first-child {
198198
 margin-top:0px;
199199
 }
200
-div.columns li {
200
+.columns li {
201201
 break-inside: avoid;
202202
 }
203203
 .filetree {
204204
 margin: 1em 0;
205205
 line-height: 1.5;
206206
--- src/default_css.txt
+++ src/default_css.txt
@@ -195,11 +195,11 @@
195 padding: 0 0 0 1em;
196 }
197 div.columns > ul li:first-child {
198 margin-top:0px;
199 }
200 div.columns li {
201 break-inside: avoid;
202 }
203 .filetree {
204 margin: 1em 0;
205 line-height: 1.5;
206
--- src/default_css.txt
+++ src/default_css.txt
@@ -195,11 +195,11 @@
195 padding: 0 0 0 1em;
196 }
197 div.columns > ul li:first-child {
198 margin-top:0px;
199 }
200 .columns li {
201 break-inside: avoid;
202 }
203 .filetree {
204 margin: 1em 0;
205 line-height: 1.5;
206
M src/makemake.tcl
+32 -73
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1567,77 +1567,41 @@
15671567
 USE_SEE = 0
15681568
 !endif
15691569
15701570
 !if $(FOSSIL_ENABLE_SSL)!=0
15711571
 SSLDIR = $(B)\compat\openssl-1.1.1
1572
-SSLINCDIR = $(SSLDIR)\inc32
1573
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1574
-SSLLIBDIR = $(SSLDIR)\out32dll
1575
-!else
1576
-SSLLIBDIR = $(SSLDIR)\out32
1577
-!endif
1578
-SSLLFLAGS = /nologo /opt:ref /debug
1579
-SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
1580
-!if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1581
-!message Using 'x64' platform for OpenSSL...
1582
-# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1583
-# SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
1584
-SSLCONFIG = VC-WIN64A no-asm
1585
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1586
-SSLCONFIG = $(SSLCONFIG) shared
1587
-!else
1588
-SSLCONFIG = $(SSLCONFIG) no-shared
1589
-!endif
1590
-SSLSETUP = ms\do_win64a.bat
1591
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1592
-SSLNMAKE = ms\ntdll.mak all
1593
-!else
1594
-SSLNMAKE = ms\nt.mak all
1595
-!endif
1596
-# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1597
-!if $(FOSSIL_DYNAMIC_BUILD)==0
1598
-SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1599
-!endif
1600
-!elseif "$(PLATFORM)"=="ia64"
1601
-!message Using 'ia64' platform for OpenSSL...
1602
-# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1603
-# SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
1604
-SSLCONFIG = VC-WIN64I no-asm
1605
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1606
-SSLCONFIG = $(SSLCONFIG) shared
1607
-!else
1608
-SSLCONFIG = $(SSLCONFIG) no-shared
1609
-!endif
1610
-SSLSETUP = ms\do_win64i.bat
1611
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1612
-SSLNMAKE = ms\ntdll.mak all
1613
-!else
1614
-SSLNMAKE = ms\nt.mak all
1615
-!endif
1616
-# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1617
-!if $(FOSSIL_DYNAMIC_BUILD)==0
1618
-SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1619
-!endif
1620
-!else
1621
-!message Assuming 'x86' platform for OpenSSL...
1622
-# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1623
-# SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
1624
-SSLCONFIG = VC-WIN32 no-asm
1625
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1626
-SSLCONFIG = $(SSLCONFIG) shared
1627
-!else
1628
-SSLCONFIG = $(SSLCONFIG) no-shared
1629
-!endif
1630
-SSLSETUP = ms\do_ms.bat
1631
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1632
-SSLNMAKE = ms\ntdll.mak all
1633
-!else
1634
-SSLNMAKE = ms\nt.mak all
1635
-!endif
1636
-# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1637
-!if $(FOSSIL_DYNAMIC_BUILD)==0
1638
-SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1572
+SSLINCDIR = $(SSLDIR)\include
1573
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
1574
+SSLLIBDIR = $(SSLDIR)
1575
+!else
1576
+SSLLIBDIR = $(SSLDIR)
1577
+!endif
1578
+SSLLFLAGS = /nologo /opt:ref /debug
1579
+SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
1580
+!if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1581
+!message Using 'x64' platform for OpenSSL...
1582
+SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
1583
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
1584
+SSLCONFIG = $(SSLCONFIG) shared
1585
+!else
1586
+SSLCONFIG = $(SSLCONFIG) no-shared
1587
+!endif
1588
+!elseif "$(PLATFORM)"=="ia64"
1589
+!message Using 'ia64' platform for OpenSSL...
1590
+SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
1591
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
1592
+SSLCONFIG = $(SSLCONFIG) shared
1593
+!else
1594
+SSLCONFIG = $(SSLCONFIG) no-shared
1595
+!endif
1596
+!else
1597
+!message Assuming 'x86' platform for OpenSSL...
1598
+SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
1599
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
1600
+SSLCONFIG = $(SSLCONFIG) shared
1601
+!else
1602
+SSLCONFIG = $(SSLCONFIG) no-shared
16391603
 !endif
16401604
 !endif
16411605
 !endif
16421606
16431607
 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -1852,16 +1816,11 @@
18521816
 @echo Building OpenSSL from "$(SSLDIR)"...
18531817
 !if "$(PERLDIR)" != ""
18541818
 @set PATH=$(PERLDIR);$(PATH)
18551819
 !endif
18561820
 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1857
- @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
1858
-!if $(FOSSIL_ENABLE_WINXP)!=0
1859
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
1860
-!else
1861
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
1862
-!endif
1821
+ @pushd "$(SSLDIR)" && $(MAKE) && popd
18631822
 !endif
18641823
18651824
 !if $(FOSSIL_ENABLE_MINIZ)==0
18661825
 !if $(FOSSIL_BUILD_ZLIB)!=0
18671826
 APPTARGETS = $(APPTARGETS) zlib
18681827
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1567,77 +1567,41 @@
1567 USE_SEE = 0
1568 !endif
1569
1570 !if $(FOSSIL_ENABLE_SSL)!=0
1571 SSLDIR = $(B)\compat\openssl-1.1.1
1572 SSLINCDIR = $(SSLDIR)\inc32
1573 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1574 SSLLIBDIR = $(SSLDIR)\out32dll
1575 !else
1576 SSLLIBDIR = $(SSLDIR)\out32
1577 !endif
1578 SSLLFLAGS = /nologo /opt:ref /debug
1579 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
1580 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1581 !message Using 'x64' platform for OpenSSL...
1582 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1583 # SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
1584 SSLCONFIG = VC-WIN64A no-asm
1585 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1586 SSLCONFIG = $(SSLCONFIG) shared
1587 !else
1588 SSLCONFIG = $(SSLCONFIG) no-shared
1589 !endif
1590 SSLSETUP = ms\do_win64a.bat
1591 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1592 SSLNMAKE = ms\ntdll.mak all
1593 !else
1594 SSLNMAKE = ms\nt.mak all
1595 !endif
1596 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1597 !if $(FOSSIL_DYNAMIC_BUILD)==0
1598 SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1599 !endif
1600 !elseif "$(PLATFORM)"=="ia64"
1601 !message Using 'ia64' platform for OpenSSL...
1602 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1603 # SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
1604 SSLCONFIG = VC-WIN64I no-asm
1605 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1606 SSLCONFIG = $(SSLCONFIG) shared
1607 !else
1608 SSLCONFIG = $(SSLCONFIG) no-shared
1609 !endif
1610 SSLSETUP = ms\do_win64i.bat
1611 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1612 SSLNMAKE = ms\ntdll.mak all
1613 !else
1614 SSLNMAKE = ms\nt.mak all
1615 !endif
1616 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1617 !if $(FOSSIL_DYNAMIC_BUILD)==0
1618 SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1619 !endif
1620 !else
1621 !message Assuming 'x86' platform for OpenSSL...
1622 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1623 # SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
1624 SSLCONFIG = VC-WIN32 no-asm
1625 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1626 SSLCONFIG = $(SSLCONFIG) shared
1627 !else
1628 SSLCONFIG = $(SSLCONFIG) no-shared
1629 !endif
1630 SSLSETUP = ms\do_ms.bat
1631 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1632 SSLNMAKE = ms\ntdll.mak all
1633 !else
1634 SSLNMAKE = ms\nt.mak all
1635 !endif
1636 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1637 !if $(FOSSIL_DYNAMIC_BUILD)==0
1638 SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1639 !endif
1640 !endif
1641 !endif
1642
1643 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -1852,16 +1816,11 @@
1852 @echo Building OpenSSL from "$(SSLDIR)"...
1853 !if "$(PERLDIR)" != ""
1854 @set PATH=$(PERLDIR);$(PATH)
1855 !endif
1856 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1857 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
1858 !if $(FOSSIL_ENABLE_WINXP)!=0
1859 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
1860 !else
1861 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
1862 !endif
1863 !endif
1864
1865 !if $(FOSSIL_ENABLE_MINIZ)==0
1866 !if $(FOSSIL_BUILD_ZLIB)!=0
1867 APPTARGETS = $(APPTARGETS) zlib
1868
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1567,77 +1567,41 @@
1567 USE_SEE = 0
1568 !endif
1569
1570 !if $(FOSSIL_ENABLE_SSL)!=0
1571 SSLDIR = $(B)\compat\openssl-1.1.1
1572 SSLINCDIR = $(SSLDIR)\include
1573 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1574 SSLLIBDIR = $(SSLDIR)
1575 !else
1576 SSLLIBDIR = $(SSLDIR)
1577 !endif
1578 SSLLFLAGS = /nologo /opt:ref /debug
1579 SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
1580 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1581 !message Using 'x64' platform for OpenSSL...
1582 SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
1583 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1584 SSLCONFIG = $(SSLCONFIG) shared
1585 !else
1586 SSLCONFIG = $(SSLCONFIG) no-shared
1587 !endif
1588 !elseif "$(PLATFORM)"=="ia64"
1589 !message Using 'ia64' platform for OpenSSL...
1590 SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
1591 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1592 SSLCONFIG = $(SSLCONFIG) shared
1593 !else
1594 SSLCONFIG = $(SSLCONFIG) no-shared
1595 !endif
1596 !else
1597 !message Assuming 'x86' platform for OpenSSL...
1598 SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
1599 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1600 SSLCONFIG = $(SSLCONFIG) shared
1601 !else
1602 SSLCONFIG = $(SSLCONFIG) no-shared
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1603 !endif
1604 !endif
1605 !endif
1606
1607 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -1852,16 +1816,11 @@
1816 @echo Building OpenSSL from "$(SSLDIR)"...
1817 !if "$(PERLDIR)" != ""
1818 @set PATH=$(PERLDIR);$(PATH)
1819 !endif
1820 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1821 @pushd "$(SSLDIR)" && $(MAKE) && popd
 
 
 
 
 
1822 !endif
1823
1824 !if $(FOSSIL_ENABLE_MINIZ)==0
1825 !if $(FOSSIL_BUILD_ZLIB)!=0
1826 APPTARGETS = $(APPTARGETS) zlib
1827
M src/makemake.tcl
+32 -73
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1567,77 +1567,41 @@
15671567
 USE_SEE = 0
15681568
 !endif
15691569
15701570
 !if $(FOSSIL_ENABLE_SSL)!=0
15711571
 SSLDIR = $(B)\compat\openssl-1.1.1
1572
-SSLINCDIR = $(SSLDIR)\inc32
1573
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1574
-SSLLIBDIR = $(SSLDIR)\out32dll
1575
-!else
1576
-SSLLIBDIR = $(SSLDIR)\out32
1577
-!endif
1578
-SSLLFLAGS = /nologo /opt:ref /debug
1579
-SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
1580
-!if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1581
-!message Using 'x64' platform for OpenSSL...
1582
-# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1583
-# SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
1584
-SSLCONFIG = VC-WIN64A no-asm
1585
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1586
-SSLCONFIG = $(SSLCONFIG) shared
1587
-!else
1588
-SSLCONFIG = $(SSLCONFIG) no-shared
1589
-!endif
1590
-SSLSETUP = ms\do_win64a.bat
1591
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1592
-SSLNMAKE = ms\ntdll.mak all
1593
-!else
1594
-SSLNMAKE = ms\nt.mak all
1595
-!endif
1596
-# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1597
-!if $(FOSSIL_DYNAMIC_BUILD)==0
1598
-SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1599
-!endif
1600
-!elseif "$(PLATFORM)"=="ia64"
1601
-!message Using 'ia64' platform for OpenSSL...
1602
-# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1603
-# SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
1604
-SSLCONFIG = VC-WIN64I no-asm
1605
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1606
-SSLCONFIG = $(SSLCONFIG) shared
1607
-!else
1608
-SSLCONFIG = $(SSLCONFIG) no-shared
1609
-!endif
1610
-SSLSETUP = ms\do_win64i.bat
1611
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1612
-SSLNMAKE = ms\ntdll.mak all
1613
-!else
1614
-SSLNMAKE = ms\nt.mak all
1615
-!endif
1616
-# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1617
-!if $(FOSSIL_DYNAMIC_BUILD)==0
1618
-SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1619
-!endif
1620
-!else
1621
-!message Assuming 'x86' platform for OpenSSL...
1622
-# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1623
-# SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
1624
-SSLCONFIG = VC-WIN32 no-asm
1625
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1626
-SSLCONFIG = $(SSLCONFIG) shared
1627
-!else
1628
-SSLCONFIG = $(SSLCONFIG) no-shared
1629
-!endif
1630
-SSLSETUP = ms\do_ms.bat
1631
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1632
-SSLNMAKE = ms\ntdll.mak all
1633
-!else
1634
-SSLNMAKE = ms\nt.mak all
1635
-!endif
1636
-# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1637
-!if $(FOSSIL_DYNAMIC_BUILD)==0
1638
-SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1572
+SSLINCDIR = $(SSLDIR)\include
1573
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
1574
+SSLLIBDIR = $(SSLDIR)
1575
+!else
1576
+SSLLIBDIR = $(SSLDIR)
1577
+!endif
1578
+SSLLFLAGS = /nologo /opt:ref /debug
1579
+SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
1580
+!if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1581
+!message Using 'x64' platform for OpenSSL...
1582
+SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
1583
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
1584
+SSLCONFIG = $(SSLCONFIG) shared
1585
+!else
1586
+SSLCONFIG = $(SSLCONFIG) no-shared
1587
+!endif
1588
+!elseif "$(PLATFORM)"=="ia64"
1589
+!message Using 'ia64' platform for OpenSSL...
1590
+SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
1591
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
1592
+SSLCONFIG = $(SSLCONFIG) shared
1593
+!else
1594
+SSLCONFIG = $(SSLCONFIG) no-shared
1595
+!endif
1596
+!else
1597
+!message Assuming 'x86' platform for OpenSSL...
1598
+SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
1599
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
1600
+SSLCONFIG = $(SSLCONFIG) shared
1601
+!else
1602
+SSLCONFIG = $(SSLCONFIG) no-shared
16391603
 !endif
16401604
 !endif
16411605
 !endif
16421606
16431607
 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -1852,16 +1816,11 @@
18521816
 @echo Building OpenSSL from "$(SSLDIR)"...
18531817
 !if "$(PERLDIR)" != ""
18541818
 @set PATH=$(PERLDIR);$(PATH)
18551819
 !endif
18561820
 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1857
- @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
1858
-!if $(FOSSIL_ENABLE_WINXP)!=0
1859
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
1860
-!else
1861
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
1862
-!endif
1821
+ @pushd "$(SSLDIR)" && $(MAKE) && popd
18631822
 !endif
18641823
18651824
 !if $(FOSSIL_ENABLE_MINIZ)==0
18661825
 !if $(FOSSIL_BUILD_ZLIB)!=0
18671826
 APPTARGETS = $(APPTARGETS) zlib
18681827
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1567,77 +1567,41 @@
1567 USE_SEE = 0
1568 !endif
1569
1570 !if $(FOSSIL_ENABLE_SSL)!=0
1571 SSLDIR = $(B)\compat\openssl-1.1.1
1572 SSLINCDIR = $(SSLDIR)\inc32
1573 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1574 SSLLIBDIR = $(SSLDIR)\out32dll
1575 !else
1576 SSLLIBDIR = $(SSLDIR)\out32
1577 !endif
1578 SSLLFLAGS = /nologo /opt:ref /debug
1579 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
1580 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1581 !message Using 'x64' platform for OpenSSL...
1582 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1583 # SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
1584 SSLCONFIG = VC-WIN64A no-asm
1585 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1586 SSLCONFIG = $(SSLCONFIG) shared
1587 !else
1588 SSLCONFIG = $(SSLCONFIG) no-shared
1589 !endif
1590 SSLSETUP = ms\do_win64a.bat
1591 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1592 SSLNMAKE = ms\ntdll.mak all
1593 !else
1594 SSLNMAKE = ms\nt.mak all
1595 !endif
1596 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1597 !if $(FOSSIL_DYNAMIC_BUILD)==0
1598 SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1599 !endif
1600 !elseif "$(PLATFORM)"=="ia64"
1601 !message Using 'ia64' platform for OpenSSL...
1602 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1603 # SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
1604 SSLCONFIG = VC-WIN64I no-asm
1605 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1606 SSLCONFIG = $(SSLCONFIG) shared
1607 !else
1608 SSLCONFIG = $(SSLCONFIG) no-shared
1609 !endif
1610 SSLSETUP = ms\do_win64i.bat
1611 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1612 SSLNMAKE = ms\ntdll.mak all
1613 !else
1614 SSLNMAKE = ms\nt.mak all
1615 !endif
1616 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1617 !if $(FOSSIL_DYNAMIC_BUILD)==0
1618 SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1619 !endif
1620 !else
1621 !message Assuming 'x86' platform for OpenSSL...
1622 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1623 # SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
1624 SSLCONFIG = VC-WIN32 no-asm
1625 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1626 SSLCONFIG = $(SSLCONFIG) shared
1627 !else
1628 SSLCONFIG = $(SSLCONFIG) no-shared
1629 !endif
1630 SSLSETUP = ms\do_ms.bat
1631 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1632 SSLNMAKE = ms\ntdll.mak all
1633 !else
1634 SSLNMAKE = ms\nt.mak all
1635 !endif
1636 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1637 !if $(FOSSIL_DYNAMIC_BUILD)==0
1638 SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1639 !endif
1640 !endif
1641 !endif
1642
1643 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -1852,16 +1816,11 @@
1852 @echo Building OpenSSL from "$(SSLDIR)"...
1853 !if "$(PERLDIR)" != ""
1854 @set PATH=$(PERLDIR);$(PATH)
1855 !endif
1856 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1857 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
1858 !if $(FOSSIL_ENABLE_WINXP)!=0
1859 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
1860 !else
1861 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
1862 !endif
1863 !endif
1864
1865 !if $(FOSSIL_ENABLE_MINIZ)==0
1866 !if $(FOSSIL_BUILD_ZLIB)!=0
1867 APPTARGETS = $(APPTARGETS) zlib
1868
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1567,77 +1567,41 @@
1567 USE_SEE = 0
1568 !endif
1569
1570 !if $(FOSSIL_ENABLE_SSL)!=0
1571 SSLDIR = $(B)\compat\openssl-1.1.1
1572 SSLINCDIR = $(SSLDIR)\include
1573 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1574 SSLLIBDIR = $(SSLDIR)
1575 !else
1576 SSLLIBDIR = $(SSLDIR)
1577 !endif
1578 SSLLFLAGS = /nologo /opt:ref /debug
1579 SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
1580 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1581 !message Using 'x64' platform for OpenSSL...
1582 SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
1583 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1584 SSLCONFIG = $(SSLCONFIG) shared
1585 !else
1586 SSLCONFIG = $(SSLCONFIG) no-shared
1587 !endif
1588 !elseif "$(PLATFORM)"=="ia64"
1589 !message Using 'ia64' platform for OpenSSL...
1590 SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
1591 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1592 SSLCONFIG = $(SSLCONFIG) shared
1593 !else
1594 SSLCONFIG = $(SSLCONFIG) no-shared
1595 !endif
1596 !else
1597 !message Assuming 'x86' platform for OpenSSL...
1598 SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
1599 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1600 SSLCONFIG = $(SSLCONFIG) shared
1601 !else
1602 SSLCONFIG = $(SSLCONFIG) no-shared
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1603 !endif
1604 !endif
1605 !endif
1606
1607 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -1852,16 +1816,11 @@
1816 @echo Building OpenSSL from "$(SSLDIR)"...
1817 !if "$(PERLDIR)" != ""
1818 @set PATH=$(PERLDIR);$(PATH)
1819 !endif
1820 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1821 @pushd "$(SSLDIR)" && $(MAKE) && popd
 
 
 
 
 
1822 !endif
1823
1824 !if $(FOSSIL_ENABLE_MINIZ)==0
1825 !if $(FOSSIL_BUILD_ZLIB)!=0
1826 APPTARGETS = $(APPTARGETS) zlib
1827
M src/markdown_html.c
+39 -9
--- src/markdown_html.c
+++ src/markdown_html.c
@@ -48,21 +48,25 @@
4848
 /* BLOB_APPEND_BLOB -- append blob contents to another */
4949
 #define BLOB_APPEND_BLOB(dest, src) \
5050
 blob_append((dest), blob_buffer(src), blob_size(src))
5151
5252
53
-/* HTML escape */
54
-
55
-static void html_escape(struct Blob *ob, const char *data, size_t size){
53
+/* HTML escapes
54
+**
55
+** html_escape() converts < to &lt;, > to &gt;, and & to &amp;.
56
+** html_quote() goes further and converts " into &quot; and ' in &#39;.
57
+*/
58
+static void html_quote(struct Blob *ob, const char *data, size_t size){
5659
 size_t beg = 0, i = 0;
5760
 while( i<size ){
5861
 beg = i;
5962
 while( i<size
6063
 && data[i]!='<'
6164
 && data[i]!='>'
6265
 && data[i]!='"'
6366
 && data[i]!='&'
67
+ && data[i]!='\''
6468
 ){
6569
 i++;
6670
 }
6771
 blob_append(ob, data+beg, i-beg);
6872
 while( i<size ){
@@ -80,10 +84,36 @@
8084
 break;
8185
 }
8286
 i++;
8387
 }
8488
 }
89
+}
90
+static void html_escape(struct Blob *ob, const char *data, size_t size){
91
+ size_t beg = 0, i = 0;
92
+ while( i<size ){
93
+ beg = i;
94
+ while( i<size
95
+ && data[i]!='<'
96
+ && data[i]!='>'
97
+ && data[i]!='&'
98
+ ){
99
+ i++;
100
+ }
101
+ blob_append(ob, data+beg, i-beg);
102
+ while( i<size ){
103
+ if( data[i]=='<' ){
104
+ BLOB_APPEND_LITERAL(ob, "&lt;");
105
+ }else if( data[i]=='>' ){
106
+ BLOB_APPEND_LITERAL(ob, "&gt;");
107
+ }else if( data[i]=='&' ){
108
+ BLOB_APPEND_LITERAL(ob, "&amp;");
109
+ }else{
110
+ break;
111
+ }
112
+ i++;
113
+ }
114
+ }
85115
 }
86116
87117
88118
 /* HTML block tags */
89119
@@ -283,11 +313,11 @@
283313
 void *opaque
284314
 ){
285315
 if( !link || blob_size(link)<=0 ) return 0;
286316
 BLOB_APPEND_LITERAL(ob, "<a href=\"");
287317
 if( type==MKDA_IMPLICIT_EMAIL ) BLOB_APPEND_LITERAL(ob, "mailto:");
288
- html_escape(ob, blob_buffer(link), blob_size(link));
318
+ html_quote(ob, blob_buffer(link), blob_size(link));
289319
 BLOB_APPEND_LITERAL(ob, "\">");
290320
 if( type==MKDA_EXPLICIT_EMAIL && blob_size(link)>7 ){
291321
 /* remove "mailto:" from displayed text */
292322
 html_escape(ob, blob_buffer(link)+7, blob_size(link)-7);
293323
 }else{
@@ -336,16 +366,16 @@
336366
 struct Blob *title,
337367
 struct Blob *alt,
338368
 void *opaque
339369
 ){
340370
 BLOB_APPEND_LITERAL(ob, "<img src=\"");
341
- html_escape(ob, blob_buffer(link), blob_size(link));
371
+ html_quote(ob, blob_buffer(link), blob_size(link));
342372
 BLOB_APPEND_LITERAL(ob, "\" alt=\"");
343
- html_escape(ob, blob_buffer(alt), blob_size(alt));
373
+ html_quote(ob, blob_buffer(alt), blob_size(alt));
344374
 if( title && blob_size(title)>0 ){
345375
 BLOB_APPEND_LITERAL(ob, "\" title=\"");
346
- html_escape(ob, blob_buffer(title), blob_size(title));
376
+ html_quote(ob, blob_buffer(title), blob_size(title));
347377
 }
348378
 BLOB_APPEND_LITERAL(ob, "\" />");
349379
 return 1;
350380
 }
351381
@@ -366,14 +396,14 @@
366396
 if( zLink && zLink[0]=='/' && g.zTop ){
367397
 /* For any hyperlink that begins with "/", make it refer to the root
368398
 ** of the Fossil repository */
369399
 blob_append(ob, g.zTop, -1);
370400
 }
371
- html_escape(ob, blob_buffer(link), blob_size(link));
401
+ html_quote(ob, blob_buffer(link), blob_size(link));
372402
 if( title && blob_size(title)>0 ){
373403
 BLOB_APPEND_LITERAL(ob, "\" title=\"");
374
- html_escape(ob, blob_buffer(title), blob_size(title));
404
+ html_quote(ob, blob_buffer(title), blob_size(title));
375405
 }
376406
 BLOB_APPEND_LITERAL(ob, "\">");
377407
 BLOB_APPEND_BLOB(ob, content);
378408
 BLOB_APPEND_LITERAL(ob, "</a>");
379409
 return 1;
380410
--- src/markdown_html.c
+++ src/markdown_html.c
@@ -48,21 +48,25 @@
48 /* BLOB_APPEND_BLOB -- append blob contents to another */
49 #define BLOB_APPEND_BLOB(dest, src) \
50 blob_append((dest), blob_buffer(src), blob_size(src))
51
52
53 /* HTML escape */
54
55 static void html_escape(struct Blob *ob, const char *data, size_t size){
 
 
 
56 size_t beg = 0, i = 0;
57 while( i<size ){
58 beg = i;
59 while( i<size
60 && data[i]!='<'
61 && data[i]!='>'
62 && data[i]!='"'
63 && data[i]!='&'
 
64 ){
65 i++;
66 }
67 blob_append(ob, data+beg, i-beg);
68 while( i<size ){
@@ -80,10 +84,36 @@
80 break;
81 }
82 i++;
83 }
84 }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
85 }
86
87
88 /* HTML block tags */
89
@@ -283,11 +313,11 @@
283 void *opaque
284 ){
285 if( !link || blob_size(link)<=0 ) return 0;
286 BLOB_APPEND_LITERAL(ob, "<a href=\"");
287 if( type==MKDA_IMPLICIT_EMAIL ) BLOB_APPEND_LITERAL(ob, "mailto:");
288 html_escape(ob, blob_buffer(link), blob_size(link));
289 BLOB_APPEND_LITERAL(ob, "\">");
290 if( type==MKDA_EXPLICIT_EMAIL && blob_size(link)>7 ){
291 /* remove "mailto:" from displayed text */
292 html_escape(ob, blob_buffer(link)+7, blob_size(link)-7);
293 }else{
@@ -336,16 +366,16 @@
336 struct Blob *title,
337 struct Blob *alt,
338 void *opaque
339 ){
340 BLOB_APPEND_LITERAL(ob, "<img src=\"");
341 html_escape(ob, blob_buffer(link), blob_size(link));
342 BLOB_APPEND_LITERAL(ob, "\" alt=\"");
343 html_escape(ob, blob_buffer(alt), blob_size(alt));
344 if( title && blob_size(title)>0 ){
345 BLOB_APPEND_LITERAL(ob, "\" title=\"");
346 html_escape(ob, blob_buffer(title), blob_size(title));
347 }
348 BLOB_APPEND_LITERAL(ob, "\" />");
349 return 1;
350 }
351
@@ -366,14 +396,14 @@
366 if( zLink && zLink[0]=='/' && g.zTop ){
367 /* For any hyperlink that begins with "/", make it refer to the root
368 ** of the Fossil repository */
369 blob_append(ob, g.zTop, -1);
370 }
371 html_escape(ob, blob_buffer(link), blob_size(link));
372 if( title && blob_size(title)>0 ){
373 BLOB_APPEND_LITERAL(ob, "\" title=\"");
374 html_escape(ob, blob_buffer(title), blob_size(title));
375 }
376 BLOB_APPEND_LITERAL(ob, "\">");
377 BLOB_APPEND_BLOB(ob, content);
378 BLOB_APPEND_LITERAL(ob, "</a>");
379 return 1;
380
--- src/markdown_html.c
+++ src/markdown_html.c
@@ -48,21 +48,25 @@
48 /* BLOB_APPEND_BLOB -- append blob contents to another */
49 #define BLOB_APPEND_BLOB(dest, src) \
50 blob_append((dest), blob_buffer(src), blob_size(src))
51
52
53 /* HTML escapes
54 **
55 ** html_escape() converts < to &lt;, > to &gt;, and & to &amp;.
56 ** html_quote() goes further and converts " into &quot; and ' in &#39;.
57 */
58 static void html_quote(struct Blob *ob, const char *data, size_t size){
59 size_t beg = 0, i = 0;
60 while( i<size ){
61 beg = i;
62 while( i<size
63 && data[i]!='<'
64 && data[i]!='>'
65 && data[i]!='"'
66 && data[i]!='&'
67 && data[i]!='\''
68 ){
69 i++;
70 }
71 blob_append(ob, data+beg, i-beg);
72 while( i<size ){
@@ -80,10 +84,36 @@
84 break;
85 }
86 i++;
87 }
88 }
89 }
90 static void html_escape(struct Blob *ob, const char *data, size_t size){
91 size_t beg = 0, i = 0;
92 while( i<size ){
93 beg = i;
94 while( i<size
95 && data[i]!='<'
96 && data[i]!='>'
97 && data[i]!='&'
98 ){
99 i++;
100 }
101 blob_append(ob, data+beg, i-beg);
102 while( i<size ){
103 if( data[i]=='<' ){
104 BLOB_APPEND_LITERAL(ob, "&lt;");
105 }else if( data[i]=='>' ){
106 BLOB_APPEND_LITERAL(ob, "&gt;");
107 }else if( data[i]=='&' ){
108 BLOB_APPEND_LITERAL(ob, "&amp;");
109 }else{
110 break;
111 }
112 i++;
113 }
114 }
115 }
116
117
118 /* HTML block tags */
119
@@ -283,11 +313,11 @@
313 void *opaque
314 ){
315 if( !link || blob_size(link)<=0 ) return 0;
316 BLOB_APPEND_LITERAL(ob, "<a href=\"");
317 if( type==MKDA_IMPLICIT_EMAIL ) BLOB_APPEND_LITERAL(ob, "mailto:");
318 html_quote(ob, blob_buffer(link), blob_size(link));
319 BLOB_APPEND_LITERAL(ob, "\">");
320 if( type==MKDA_EXPLICIT_EMAIL && blob_size(link)>7 ){
321 /* remove "mailto:" from displayed text */
322 html_escape(ob, blob_buffer(link)+7, blob_size(link)-7);
323 }else{
@@ -336,16 +366,16 @@
366 struct Blob *title,
367 struct Blob *alt,
368 void *opaque
369 ){
370 BLOB_APPEND_LITERAL(ob, "<img src=\"");
371 html_quote(ob, blob_buffer(link), blob_size(link));
372 BLOB_APPEND_LITERAL(ob, "\" alt=\"");
373 html_quote(ob, blob_buffer(alt), blob_size(alt));
374 if( title && blob_size(title)>0 ){
375 BLOB_APPEND_LITERAL(ob, "\" title=\"");
376 html_quote(ob, blob_buffer(title), blob_size(title));
377 }
378 BLOB_APPEND_LITERAL(ob, "\" />");
379 return 1;
380 }
381
@@ -366,14 +396,14 @@
396 if( zLink && zLink[0]=='/' && g.zTop ){
397 /* For any hyperlink that begins with "/", make it refer to the root
398 ** of the Fossil repository */
399 blob_append(ob, g.zTop, -1);
400 }
401 html_quote(ob, blob_buffer(link), blob_size(link));
402 if( title && blob_size(title)>0 ){
403 BLOB_APPEND_LITERAL(ob, "\" title=\"");
404 html_quote(ob, blob_buffer(title), blob_size(title));
405 }
406 BLOB_APPEND_LITERAL(ob, "\">");
407 BLOB_APPEND_BLOB(ob, content);
408 BLOB_APPEND_LITERAL(ob, "</a>");
409 return 1;
410
M src/sitemap.c
+1 -1
--- src/sitemap.c
+++ src/sitemap.c
@@ -43,11 +43,11 @@
4343
 { "License", "sitemap-license" },
4444
 { "Contact", "sitemap-contact" },
4545
 };
4646
4747
 login_check_credentials();
48
- if( P("popup")!=0 && cgi_csrf_safe(1) ){
48
+ if( P("popup")!=0 && cgi_csrf_safe(0) ){
4949
 /* If this is a POST from the same origin with the popup=1 parameter,
5050
 ** then disable anti-robot defenses */
5151
 isPopup = 1;
5252
 g.perm.Hyperlink = 1;
5353
 g.javascriptHyperlink = 0;
5454
--- src/sitemap.c
+++ src/sitemap.c
@@ -43,11 +43,11 @@
43 { "License", "sitemap-license" },
44 { "Contact", "sitemap-contact" },
45 };
46
47 login_check_credentials();
48 if( P("popup")!=0 && cgi_csrf_safe(1) ){
49 /* If this is a POST from the same origin with the popup=1 parameter,
50 ** then disable anti-robot defenses */
51 isPopup = 1;
52 g.perm.Hyperlink = 1;
53 g.javascriptHyperlink = 0;
54
--- src/sitemap.c
+++ src/sitemap.c
@@ -43,11 +43,11 @@
43 { "License", "sitemap-license" },
44 { "Contact", "sitemap-contact" },
45 };
46
47 login_check_credentials();
48 if( P("popup")!=0 && cgi_csrf_safe(0) ){
49 /* If this is a POST from the same origin with the popup=1 parameter,
50 ** then disable anti-robot defenses */
51 isPopup = 1;
52 g.perm.Hyperlink = 1;
53 g.javascriptHyperlink = 0;
54
M src/sqlite3.c
+16 -8
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1,8 +1,8 @@
11
 /******************************************************************************
22
 ** This file is an amalgamation of many separate C source files from SQLite
3
-** version 3.25.0. By combining all the individual C code files into this
3
+** version 3.25.1. By combining all the individual C code files into this
44
 ** single large file, the entire code can be compiled as a single translation
55
 ** unit. This allows many compilers to do optimizations that would not be
66
 ** possible if the files were compiled separately. Performance improvements
77
 ** of 5% or more are commonly seen when SQLite is compiled as a single
88
 ** translation unit.
@@ -1154,13 +1154,13 @@
11541154
 **
11551155
 ** See also: [sqlite3_libversion()],
11561156
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
11571157
 ** [sqlite_version()] and [sqlite_source_id()].
11581158
 */
1159
-#define SQLITE_VERSION "3.25.0"
1160
-#define SQLITE_VERSION_NUMBER 3025000
1161
-#define SQLITE_SOURCE_ID "2018-09-15 04:01:47 b63af6c3bd33152742648d5d2e8dc5d5fcbcdd27df409272b6aea00a6f761760"
1159
+#define SQLITE_VERSION "3.25.1"
1160
+#define SQLITE_VERSION_NUMBER 3025001
1161
+#define SQLITE_SOURCE_ID "2018-09-18 20:20:44 2ac9003de44da7dafa3fbb1915ac5725a9275c86bf2f3b7aa19321bf1460b386"
11621162
11631163
 /*
11641164
 ** CAPI3REF: Run-Time Library Version Numbers
11651165
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
11661166
 **
@@ -102203,11 +102203,11 @@
102203102203
 }
102204102204
 if( rc==SQLITE_OK && pStep->zTarget ){
102205102205
 Table *pTarget = sqlite3LocateTable(pParse, 0, pStep->zTarget, zDb);
102206102206
 if( pTarget==0 ){
102207102207
 rc = SQLITE_ERROR;
102208
- }else{
102208
+ }else if( SQLITE_OK==(rc = sqlite3ViewGetColumnNames(pParse, pTarget)) ){
102209102209
 SrcList sSrc;
102210102210
 memset(&sSrc, 0, sizeof(sSrc));
102211102211
 sSrc.nSrc = 1;
102212102212
 sSrc.a[0].zName = pStep->zTarget;
102213102213
 sSrc.a[0].pTab = pTarget;
@@ -107849,10 +107849,14 @@
107849107849
 ** statement that defines the view.
107850107850
 */
107851107851
 assert( pTable->pSelect );
107852107852
 pSel = sqlite3SelectDup(db, pTable->pSelect, 0);
107853107853
 if( pSel ){
107854
+#ifndef SQLITE_OMIT_ALTERTABLE
107855
+ u8 eParseMode = pParse->eParseMode;
107856
+ pParse->eParseMode = PARSE_MODE_NORMAL;
107857
+#endif
107854107858
 n = pParse->nTab;
107855107859
 sqlite3SrcListAssignCursors(pParse, pSel->pSrc);
107856107860
 pTable->nCol = -1;
107857107861
 db->lookaside.bDisable++;
107858107862
 #ifndef SQLITE_OMIT_AUTHORIZATION
@@ -107894,10 +107898,13 @@
107894107898
 nErr++;
107895107899
 }
107896107900
 sqlite3DeleteTable(db, pSelTab);
107897107901
 sqlite3SelectDelete(db, pSel);
107898107902
 db->lookaside.bDisable--;
107903
+#ifndef SQLITE_OMIT_ALTERTABLE
107904
+ pParse->eParseMode = eParseMode;
107905
+#endif
107899107906
 } else {
107900107907
 nErr++;
107901107908
 }
107902107909
 pTable->pSchema->schemaFlags |= DB_UnresetViews;
107903107910
 if( db->mallocFailed ){
@@ -129181,10 +129188,11 @@
129181129188
 sqlite3WindowCodeStep(pParse, p, pWInfo, regGosub, addrGosub);
129182129189
129183129190
 sqlite3VdbeAddOp2(v, OP_Goto, 0, iBreak);
129184129191
 sqlite3VdbeResolveLabel(v, addrGosub);
129185129192
 VdbeNoopComment((v, "inner-loop subroutine"));
129193
+ sSort.labelOBLopt = 0;
129186129194
 selectInnerLoop(pParse, p, -1, &sSort, &sDistinct, pDest, iCont, iBreak);
129187129195
 sqlite3VdbeResolveLabel(v, iCont);
129188129196
 sqlite3VdbeAddOp1(v, OP_Return, regGosub);
129189129197
 VdbeComment((v, "end inner-loop subroutine"));
129190129198
 sqlite3VdbeResolveLabel(v, iBreak);
@@ -214414,11 +214422,11 @@
214414214422
 int nArg, /* Number of args */
214415214423
 sqlite3_value **apUnused /* Function arguments */
214416214424
 ){
214417214425
 assert( nArg==0 );
214418214426
 UNUSED_PARAM2(nArg, apUnused);
214419
- sqlite3_result_text(pCtx, "fts5: 2018-09-15 04:01:47 b63af6c3bd33152742648d5d2e8dc5d5fcbcdd27df409272b6aea00a6f761760", -1, SQLITE_TRANSIENT);
214427
+ sqlite3_result_text(pCtx, "fts5: 2018-09-18 20:20:44 2ac9003de44da7dafa3fbb1915ac5725a9275c86bf2f3b7aa19321bf1460b386", -1, SQLITE_TRANSIENT);
214420214428
 }
214421214429
214422214430
 static int fts5Init(sqlite3 *db){
214423214431
 static const sqlite3_module fts5Mod = {
214424214432
 /* iVersion */ 2,
@@ -219124,12 +219132,12 @@
219124219132
 }
219125219133
 #endif /* SQLITE_CORE */
219126219134
 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
219127219135
219128219136
 /************** End of stmt.c ************************************************/
219129
-#if __LINE__!=219129
219137
+#if __LINE__!=219137
219130219138
 #undef SQLITE_SOURCE_ID
219131
-#define SQLITE_SOURCE_ID "2018-09-15 04:01:47 b63af6c3bd33152742648d5d2e8dc5d5fcbcdd27df409272b6aea00a6f76alt2"
219139
+#define SQLITE_SOURCE_ID "2018-09-18 20:20:44 2ac9003de44da7dafa3fbb1915ac5725a9275c86bf2f3b7aa19321bf1460alt2"
219132219140
 #endif
219133219141
 /* Return the source-id for this library */
219134219142
 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
219135219143
 /************************** End of sqlite3.c ******************************/
219136219144
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1,8 +1,8 @@
1 /******************************************************************************
2 ** This file is an amalgamation of many separate C source files from SQLite
3 ** version 3.25.0. By combining all the individual C code files into this
4 ** single large file, the entire code can be compiled as a single translation
5 ** unit. This allows many compilers to do optimizations that would not be
6 ** possible if the files were compiled separately. Performance improvements
7 ** of 5% or more are commonly seen when SQLite is compiled as a single
8 ** translation unit.
@@ -1154,13 +1154,13 @@
1154 **
1155 ** See also: [sqlite3_libversion()],
1156 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
1157 ** [sqlite_version()] and [sqlite_source_id()].
1158 */
1159 #define SQLITE_VERSION "3.25.0"
1160 #define SQLITE_VERSION_NUMBER 3025000
1161 #define SQLITE_SOURCE_ID "2018-09-15 04:01:47 b63af6c3bd33152742648d5d2e8dc5d5fcbcdd27df409272b6aea00a6f761760"
1162
1163 /*
1164 ** CAPI3REF: Run-Time Library Version Numbers
1165 ** KEYWORDS: sqlite3_version sqlite3_sourceid
1166 **
@@ -102203,11 +102203,11 @@
102203 }
102204 if( rc==SQLITE_OK && pStep->zTarget ){
102205 Table *pTarget = sqlite3LocateTable(pParse, 0, pStep->zTarget, zDb);
102206 if( pTarget==0 ){
102207 rc = SQLITE_ERROR;
102208 }else{
102209 SrcList sSrc;
102210 memset(&sSrc, 0, sizeof(sSrc));
102211 sSrc.nSrc = 1;
102212 sSrc.a[0].zName = pStep->zTarget;
102213 sSrc.a[0].pTab = pTarget;
@@ -107849,10 +107849,14 @@
107849 ** statement that defines the view.
107850 */
107851 assert( pTable->pSelect );
107852 pSel = sqlite3SelectDup(db, pTable->pSelect, 0);
107853 if( pSel ){
 
 
 
 
107854 n = pParse->nTab;
107855 sqlite3SrcListAssignCursors(pParse, pSel->pSrc);
107856 pTable->nCol = -1;
107857 db->lookaside.bDisable++;
107858 #ifndef SQLITE_OMIT_AUTHORIZATION
@@ -107894,10 +107898,13 @@
107894 nErr++;
107895 }
107896 sqlite3DeleteTable(db, pSelTab);
107897 sqlite3SelectDelete(db, pSel);
107898 db->lookaside.bDisable--;
 
 
 
107899 } else {
107900 nErr++;
107901 }
107902 pTable->pSchema->schemaFlags |= DB_UnresetViews;
107903 if( db->mallocFailed ){
@@ -129181,10 +129188,11 @@
129181 sqlite3WindowCodeStep(pParse, p, pWInfo, regGosub, addrGosub);
129182
129183 sqlite3VdbeAddOp2(v, OP_Goto, 0, iBreak);
129184 sqlite3VdbeResolveLabel(v, addrGosub);
129185 VdbeNoopComment((v, "inner-loop subroutine"));
 
129186 selectInnerLoop(pParse, p, -1, &sSort, &sDistinct, pDest, iCont, iBreak);
129187 sqlite3VdbeResolveLabel(v, iCont);
129188 sqlite3VdbeAddOp1(v, OP_Return, regGosub);
129189 VdbeComment((v, "end inner-loop subroutine"));
129190 sqlite3VdbeResolveLabel(v, iBreak);
@@ -214414,11 +214422,11 @@
214414 int nArg, /* Number of args */
214415 sqlite3_value **apUnused /* Function arguments */
214416 ){
214417 assert( nArg==0 );
214418 UNUSED_PARAM2(nArg, apUnused);
214419 sqlite3_result_text(pCtx, "fts5: 2018-09-15 04:01:47 b63af6c3bd33152742648d5d2e8dc5d5fcbcdd27df409272b6aea00a6f761760", -1, SQLITE_TRANSIENT);
214420 }
214421
214422 static int fts5Init(sqlite3 *db){
214423 static const sqlite3_module fts5Mod = {
214424 /* iVersion */ 2,
@@ -219124,12 +219132,12 @@
219124 }
219125 #endif /* SQLITE_CORE */
219126 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
219127
219128 /************** End of stmt.c ************************************************/
219129 #if __LINE__!=219129
219130 #undef SQLITE_SOURCE_ID
219131 #define SQLITE_SOURCE_ID "2018-09-15 04:01:47 b63af6c3bd33152742648d5d2e8dc5d5fcbcdd27df409272b6aea00a6f76alt2"
219132 #endif
219133 /* Return the source-id for this library */
219134 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
219135 /************************** End of sqlite3.c ******************************/
219136
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1,8 +1,8 @@
1 /******************************************************************************
2 ** This file is an amalgamation of many separate C source files from SQLite
3 ** version 3.25.1. By combining all the individual C code files into this
4 ** single large file, the entire code can be compiled as a single translation
5 ** unit. This allows many compilers to do optimizations that would not be
6 ** possible if the files were compiled separately. Performance improvements
7 ** of 5% or more are commonly seen when SQLite is compiled as a single
8 ** translation unit.
@@ -1154,13 +1154,13 @@
1154 **
1155 ** See also: [sqlite3_libversion()],
1156 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
1157 ** [sqlite_version()] and [sqlite_source_id()].
1158 */
1159 #define SQLITE_VERSION "3.25.1"
1160 #define SQLITE_VERSION_NUMBER 3025001
1161 #define SQLITE_SOURCE_ID "2018-09-18 20:20:44 2ac9003de44da7dafa3fbb1915ac5725a9275c86bf2f3b7aa19321bf1460b386"
1162
1163 /*
1164 ** CAPI3REF: Run-Time Library Version Numbers
1165 ** KEYWORDS: sqlite3_version sqlite3_sourceid
1166 **
@@ -102203,11 +102203,11 @@
102203 }
102204 if( rc==SQLITE_OK && pStep->zTarget ){
102205 Table *pTarget = sqlite3LocateTable(pParse, 0, pStep->zTarget, zDb);
102206 if( pTarget==0 ){
102207 rc = SQLITE_ERROR;
102208 }else if( SQLITE_OK==(rc = sqlite3ViewGetColumnNames(pParse, pTarget)) ){
102209 SrcList sSrc;
102210 memset(&sSrc, 0, sizeof(sSrc));
102211 sSrc.nSrc = 1;
102212 sSrc.a[0].zName = pStep->zTarget;
102213 sSrc.a[0].pTab = pTarget;
@@ -107849,10 +107849,14 @@
107849 ** statement that defines the view.
107850 */
107851 assert( pTable->pSelect );
107852 pSel = sqlite3SelectDup(db, pTable->pSelect, 0);
107853 if( pSel ){
107854 #ifndef SQLITE_OMIT_ALTERTABLE
107855 u8 eParseMode = pParse->eParseMode;
107856 pParse->eParseMode = PARSE_MODE_NORMAL;
107857 #endif
107858 n = pParse->nTab;
107859 sqlite3SrcListAssignCursors(pParse, pSel->pSrc);
107860 pTable->nCol = -1;
107861 db->lookaside.bDisable++;
107862 #ifndef SQLITE_OMIT_AUTHORIZATION
@@ -107894,10 +107898,13 @@
107898 nErr++;
107899 }
107900 sqlite3DeleteTable(db, pSelTab);
107901 sqlite3SelectDelete(db, pSel);
107902 db->lookaside.bDisable--;
107903 #ifndef SQLITE_OMIT_ALTERTABLE
107904 pParse->eParseMode = eParseMode;
107905 #endif
107906 } else {
107907 nErr++;
107908 }
107909 pTable->pSchema->schemaFlags |= DB_UnresetViews;
107910 if( db->mallocFailed ){
@@ -129181,10 +129188,11 @@
129188 sqlite3WindowCodeStep(pParse, p, pWInfo, regGosub, addrGosub);
129189
129190 sqlite3VdbeAddOp2(v, OP_Goto, 0, iBreak);
129191 sqlite3VdbeResolveLabel(v, addrGosub);
129192 VdbeNoopComment((v, "inner-loop subroutine"));
129193 sSort.labelOBLopt = 0;
129194 selectInnerLoop(pParse, p, -1, &sSort, &sDistinct, pDest, iCont, iBreak);
129195 sqlite3VdbeResolveLabel(v, iCont);
129196 sqlite3VdbeAddOp1(v, OP_Return, regGosub);
129197 VdbeComment((v, "end inner-loop subroutine"));
129198 sqlite3VdbeResolveLabel(v, iBreak);
@@ -214414,11 +214422,11 @@
214422 int nArg, /* Number of args */
214423 sqlite3_value **apUnused /* Function arguments */
214424 ){
214425 assert( nArg==0 );
214426 UNUSED_PARAM2(nArg, apUnused);
214427 sqlite3_result_text(pCtx, "fts5: 2018-09-18 20:20:44 2ac9003de44da7dafa3fbb1915ac5725a9275c86bf2f3b7aa19321bf1460b386", -1, SQLITE_TRANSIENT);
214428 }
214429
214430 static int fts5Init(sqlite3 *db){
214431 static const sqlite3_module fts5Mod = {
214432 /* iVersion */ 2,
@@ -219124,12 +219132,12 @@
219132 }
219133 #endif /* SQLITE_CORE */
219134 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
219135
219136 /************** End of stmt.c ************************************************/
219137 #if __LINE__!=219137
219138 #undef SQLITE_SOURCE_ID
219139 #define SQLITE_SOURCE_ID "2018-09-18 20:20:44 2ac9003de44da7dafa3fbb1915ac5725a9275c86bf2f3b7aa19321bf1460alt2"
219140 #endif
219141 /* Return the source-id for this library */
219142 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
219143 /************************** End of sqlite3.c ******************************/
219144
M src/sqlite3.h
+3 -3
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -121,13 +121,13 @@
121121
 **
122122
 ** See also: [sqlite3_libversion()],
123123
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
124124
 ** [sqlite_version()] and [sqlite_source_id()].
125125
 */
126
-#define SQLITE_VERSION "3.25.0"
127
-#define SQLITE_VERSION_NUMBER 3025000
128
-#define SQLITE_SOURCE_ID "2018-09-15 04:01:47 b63af6c3bd33152742648d5d2e8dc5d5fcbcdd27df409272b6aea00a6f761760"
126
+#define SQLITE_VERSION "3.25.1"
127
+#define SQLITE_VERSION_NUMBER 3025001
128
+#define SQLITE_SOURCE_ID "2018-09-18 20:20:44 2ac9003de44da7dafa3fbb1915ac5725a9275c86bf2f3b7aa19321bf1460b386"
129129
130130
 /*
131131
 ** CAPI3REF: Run-Time Library Version Numbers
132132
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
133133
 **
134134
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -121,13 +121,13 @@
121 **
122 ** See also: [sqlite3_libversion()],
123 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
124 ** [sqlite_version()] and [sqlite_source_id()].
125 */
126 #define SQLITE_VERSION "3.25.0"
127 #define SQLITE_VERSION_NUMBER 3025000
128 #define SQLITE_SOURCE_ID "2018-09-15 04:01:47 b63af6c3bd33152742648d5d2e8dc5d5fcbcdd27df409272b6aea00a6f761760"
129
130 /*
131 ** CAPI3REF: Run-Time Library Version Numbers
132 ** KEYWORDS: sqlite3_version sqlite3_sourceid
133 **
134
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -121,13 +121,13 @@
121 **
122 ** See also: [sqlite3_libversion()],
123 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
124 ** [sqlite_version()] and [sqlite_source_id()].
125 */
126 #define SQLITE_VERSION "3.25.1"
127 #define SQLITE_VERSION_NUMBER 3025001
128 #define SQLITE_SOURCE_ID "2018-09-18 20:20:44 2ac9003de44da7dafa3fbb1915ac5725a9275c86bf2f3b7aa19321bf1460b386"
129
130 /*
131 ** CAPI3REF: Run-Time Library Version Numbers
132 ** KEYWORDS: sqlite3_version sqlite3_sourceid
133 **
134
M win/Makefile.msc
+32 -73
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -99,77 +99,41 @@
9999
 USE_SEE = 0
100100
 !endif
101101
102102
 !if $(FOSSIL_ENABLE_SSL)!=0
103103
 SSLDIR = $(B)\compat\openssl-1.1.1
104
-SSLINCDIR = $(SSLDIR)\inc32
105
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
106
-SSLLIBDIR = $(SSLDIR)\out32dll
107
-!else
108
-SSLLIBDIR = $(SSLDIR)\out32
109
-!endif
110
-SSLLFLAGS = /nologo /opt:ref /debug
111
-SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
112
-!if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113
-!message Using 'x64' platform for OpenSSL...
114
-# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
115
-# SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
116
-SSLCONFIG = VC-WIN64A no-asm
117
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
118
-SSLCONFIG = $(SSLCONFIG) shared
119
-!else
120
-SSLCONFIG = $(SSLCONFIG) no-shared
121
-!endif
122
-SSLSETUP = ms\do_win64a.bat
123
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
124
-SSLNMAKE = ms\ntdll.mak all
125
-!else
126
-SSLNMAKE = ms\nt.mak all
127
-!endif
128
-# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
129
-!if $(FOSSIL_DYNAMIC_BUILD)==0
130
-SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
131
-!endif
132
-!elseif "$(PLATFORM)"=="ia64"
133
-!message Using 'ia64' platform for OpenSSL...
134
-# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
135
-# SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
136
-SSLCONFIG = VC-WIN64I no-asm
137
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
138
-SSLCONFIG = $(SSLCONFIG) shared
139
-!else
140
-SSLCONFIG = $(SSLCONFIG) no-shared
141
-!endif
142
-SSLSETUP = ms\do_win64i.bat
143
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
144
-SSLNMAKE = ms\ntdll.mak all
145
-!else
146
-SSLNMAKE = ms\nt.mak all
147
-!endif
148
-# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
149
-!if $(FOSSIL_DYNAMIC_BUILD)==0
150
-SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
151
-!endif
152
-!else
153
-!message Assuming 'x86' platform for OpenSSL...
154
-# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
155
-# SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
156
-SSLCONFIG = VC-WIN32 no-asm
157
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
158
-SSLCONFIG = $(SSLCONFIG) shared
159
-!else
160
-SSLCONFIG = $(SSLCONFIG) no-shared
161
-!endif
162
-SSLSETUP = ms\do_ms.bat
163
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
164
-SSLNMAKE = ms\ntdll.mak all
165
-!else
166
-SSLNMAKE = ms\nt.mak all
167
-!endif
168
-# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
169
-!if $(FOSSIL_DYNAMIC_BUILD)==0
170
-SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
104
+SSLINCDIR = $(SSLDIR)\include
105
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
106
+SSLLIBDIR = $(SSLDIR)
107
+!else
108
+SSLLIBDIR = $(SSLDIR)
109
+!endif
110
+SSLLFLAGS = /nologo /opt:ref /debug
111
+SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
112
+!if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113
+!message Using 'x64' platform for OpenSSL...
114
+SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
115
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
116
+SSLCONFIG = $(SSLCONFIG) shared
117
+!else
118
+SSLCONFIG = $(SSLCONFIG) no-shared
119
+!endif
120
+!elseif "$(PLATFORM)"=="ia64"
121
+!message Using 'ia64' platform for OpenSSL...
122
+SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
123
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
124
+SSLCONFIG = $(SSLCONFIG) shared
125
+!else
126
+SSLCONFIG = $(SSLCONFIG) no-shared
127
+!endif
128
+!else
129
+!message Assuming 'x86' platform for OpenSSL...
130
+SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
131
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
132
+SSLCONFIG = $(SSLCONFIG) shared
133
+!else
134
+SSLCONFIG = $(SSLCONFIG) no-shared
171135
 !endif
172136
 !endif
173137
 !endif
174138
175139
 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -754,16 +718,11 @@
754718
 @echo Building OpenSSL from "$(SSLDIR)"...
755719
 !if "$(PERLDIR)" != ""
756720
 @set PATH=$(PERLDIR);$(PATH)
757721
 !endif
758722
 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
759
- @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
760
-!if $(FOSSIL_ENABLE_WINXP)!=0
761
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
762
-!else
763
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
764
-!endif
723
+ @pushd "$(SSLDIR)" && $(MAKE) && popd
765724
 !endif
766725
767726
 !if $(FOSSIL_ENABLE_MINIZ)==0
768727
 !if $(FOSSIL_BUILD_ZLIB)!=0
769728
 APPTARGETS = $(APPTARGETS) zlib
770729
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -99,77 +99,41 @@
99 USE_SEE = 0
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.1.1
104 SSLINCDIR = $(SSLDIR)\inc32
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)\out32dll
107 !else
108 SSLLIBDIR = $(SSLDIR)\out32
109 !endif
110 SSLLFLAGS = /nologo /opt:ref /debug
111 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
112 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113 !message Using 'x64' platform for OpenSSL...
114 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
115 # SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
116 SSLCONFIG = VC-WIN64A no-asm
117 !if $(FOSSIL_DYNAMIC_BUILD)!=0
118 SSLCONFIG = $(SSLCONFIG) shared
119 !else
120 SSLCONFIG = $(SSLCONFIG) no-shared
121 !endif
122 SSLSETUP = ms\do_win64a.bat
123 !if $(FOSSIL_DYNAMIC_BUILD)!=0
124 SSLNMAKE = ms\ntdll.mak all
125 !else
126 SSLNMAKE = ms\nt.mak all
127 !endif
128 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
129 !if $(FOSSIL_DYNAMIC_BUILD)==0
130 SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
131 !endif
132 !elseif "$(PLATFORM)"=="ia64"
133 !message Using 'ia64' platform for OpenSSL...
134 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
135 # SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
136 SSLCONFIG = VC-WIN64I no-asm
137 !if $(FOSSIL_DYNAMIC_BUILD)!=0
138 SSLCONFIG = $(SSLCONFIG) shared
139 !else
140 SSLCONFIG = $(SSLCONFIG) no-shared
141 !endif
142 SSLSETUP = ms\do_win64i.bat
143 !if $(FOSSIL_DYNAMIC_BUILD)!=0
144 SSLNMAKE = ms\ntdll.mak all
145 !else
146 SSLNMAKE = ms\nt.mak all
147 !endif
148 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
149 !if $(FOSSIL_DYNAMIC_BUILD)==0
150 SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
151 !endif
152 !else
153 !message Assuming 'x86' platform for OpenSSL...
154 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
155 # SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
156 SSLCONFIG = VC-WIN32 no-asm
157 !if $(FOSSIL_DYNAMIC_BUILD)!=0
158 SSLCONFIG = $(SSLCONFIG) shared
159 !else
160 SSLCONFIG = $(SSLCONFIG) no-shared
161 !endif
162 SSLSETUP = ms\do_ms.bat
163 !if $(FOSSIL_DYNAMIC_BUILD)!=0
164 SSLNMAKE = ms\ntdll.mak all
165 !else
166 SSLNMAKE = ms\nt.mak all
167 !endif
168 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
169 !if $(FOSSIL_DYNAMIC_BUILD)==0
170 SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
171 !endif
172 !endif
173 !endif
174
175 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -754,16 +718,11 @@
754 @echo Building OpenSSL from "$(SSLDIR)"...
755 !if "$(PERLDIR)" != ""
756 @set PATH=$(PERLDIR);$(PATH)
757 !endif
758 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
759 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
760 !if $(FOSSIL_ENABLE_WINXP)!=0
761 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
762 !else
763 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
764 !endif
765 !endif
766
767 !if $(FOSSIL_ENABLE_MINIZ)==0
768 !if $(FOSSIL_BUILD_ZLIB)!=0
769 APPTARGETS = $(APPTARGETS) zlib
770
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -99,77 +99,41 @@
99 USE_SEE = 0
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.1.1
104 SSLINCDIR = $(SSLDIR)\include
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)
107 !else
108 SSLLIBDIR = $(SSLDIR)
109 !endif
110 SSLLFLAGS = /nologo /opt:ref /debug
111 SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
112 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113 !message Using 'x64' platform for OpenSSL...
114 SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
115 !if $(FOSSIL_DYNAMIC_BUILD)!=0
116 SSLCONFIG = $(SSLCONFIG) shared
117 !else
118 SSLCONFIG = $(SSLCONFIG) no-shared
119 !endif
120 !elseif "$(PLATFORM)"=="ia64"
121 !message Using 'ia64' platform for OpenSSL...
122 SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
123 !if $(FOSSIL_DYNAMIC_BUILD)!=0
124 SSLCONFIG = $(SSLCONFIG) shared
125 !else
126 SSLCONFIG = $(SSLCONFIG) no-shared
127 !endif
128 !else
129 !message Assuming 'x86' platform for OpenSSL...
130 SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
131 !if $(FOSSIL_DYNAMIC_BUILD)!=0
132 SSLCONFIG = $(SSLCONFIG) shared
133 !else
134 SSLCONFIG = $(SSLCONFIG) no-shared
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
135 !endif
136 !endif
137 !endif
138
139 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -754,16 +718,11 @@
718 @echo Building OpenSSL from "$(SSLDIR)"...
719 !if "$(PERLDIR)" != ""
720 @set PATH=$(PERLDIR);$(PATH)
721 !endif
722 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
723 @pushd "$(SSLDIR)" && $(MAKE) && popd
 
 
 
 
 
724 !endif
725
726 !if $(FOSSIL_ENABLE_MINIZ)==0
727 !if $(FOSSIL_BUILD_ZLIB)!=0
728 APPTARGETS = $(APPTARGETS) zlib
729
M win/Makefile.msc
+32 -73
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -99,77 +99,41 @@
9999
 USE_SEE = 0
100100
 !endif
101101
102102
 !if $(FOSSIL_ENABLE_SSL)!=0
103103
 SSLDIR = $(B)\compat\openssl-1.1.1
104
-SSLINCDIR = $(SSLDIR)\inc32
105
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
106
-SSLLIBDIR = $(SSLDIR)\out32dll
107
-!else
108
-SSLLIBDIR = $(SSLDIR)\out32
109
-!endif
110
-SSLLFLAGS = /nologo /opt:ref /debug
111
-SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
112
-!if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113
-!message Using 'x64' platform for OpenSSL...
114
-# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
115
-# SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
116
-SSLCONFIG = VC-WIN64A no-asm
117
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
118
-SSLCONFIG = $(SSLCONFIG) shared
119
-!else
120
-SSLCONFIG = $(SSLCONFIG) no-shared
121
-!endif
122
-SSLSETUP = ms\do_win64a.bat
123
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
124
-SSLNMAKE = ms\ntdll.mak all
125
-!else
126
-SSLNMAKE = ms\nt.mak all
127
-!endif
128
-# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
129
-!if $(FOSSIL_DYNAMIC_BUILD)==0
130
-SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
131
-!endif
132
-!elseif "$(PLATFORM)"=="ia64"
133
-!message Using 'ia64' platform for OpenSSL...
134
-# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
135
-# SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
136
-SSLCONFIG = VC-WIN64I no-asm
137
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
138
-SSLCONFIG = $(SSLCONFIG) shared
139
-!else
140
-SSLCONFIG = $(SSLCONFIG) no-shared
141
-!endif
142
-SSLSETUP = ms\do_win64i.bat
143
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
144
-SSLNMAKE = ms\ntdll.mak all
145
-!else
146
-SSLNMAKE = ms\nt.mak all
147
-!endif
148
-# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
149
-!if $(FOSSIL_DYNAMIC_BUILD)==0
150
-SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
151
-!endif
152
-!else
153
-!message Assuming 'x86' platform for OpenSSL...
154
-# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
155
-# SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
156
-SSLCONFIG = VC-WIN32 no-asm
157
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
158
-SSLCONFIG = $(SSLCONFIG) shared
159
-!else
160
-SSLCONFIG = $(SSLCONFIG) no-shared
161
-!endif
162
-SSLSETUP = ms\do_ms.bat
163
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
164
-SSLNMAKE = ms\ntdll.mak all
165
-!else
166
-SSLNMAKE = ms\nt.mak all
167
-!endif
168
-# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
169
-!if $(FOSSIL_DYNAMIC_BUILD)==0
170
-SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
104
+SSLINCDIR = $(SSLDIR)\include
105
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
106
+SSLLIBDIR = $(SSLDIR)
107
+!else
108
+SSLLIBDIR = $(SSLDIR)
109
+!endif
110
+SSLLFLAGS = /nologo /opt:ref /debug
111
+SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
112
+!if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113
+!message Using 'x64' platform for OpenSSL...
114
+SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
115
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
116
+SSLCONFIG = $(SSLCONFIG) shared
117
+!else
118
+SSLCONFIG = $(SSLCONFIG) no-shared
119
+!endif
120
+!elseif "$(PLATFORM)"=="ia64"
121
+!message Using 'ia64' platform for OpenSSL...
122
+SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
123
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
124
+SSLCONFIG = $(SSLCONFIG) shared
125
+!else
126
+SSLCONFIG = $(SSLCONFIG) no-shared
127
+!endif
128
+!else
129
+!message Assuming 'x86' platform for OpenSSL...
130
+SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
131
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
132
+SSLCONFIG = $(SSLCONFIG) shared
133
+!else
134
+SSLCONFIG = $(SSLCONFIG) no-shared
171135
 !endif
172136
 !endif
173137
 !endif
174138
175139
 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -754,16 +718,11 @@
754718
 @echo Building OpenSSL from "$(SSLDIR)"...
755719
 !if "$(PERLDIR)" != ""
756720
 @set PATH=$(PERLDIR);$(PATH)
757721
 !endif
758722
 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
759
- @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
760
-!if $(FOSSIL_ENABLE_WINXP)!=0
761
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
762
-!else
763
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
764
-!endif
723
+ @pushd "$(SSLDIR)" && $(MAKE) && popd
765724
 !endif
766725
767726
 !if $(FOSSIL_ENABLE_MINIZ)==0
768727
 !if $(FOSSIL_BUILD_ZLIB)!=0
769728
 APPTARGETS = $(APPTARGETS) zlib
770729
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -99,77 +99,41 @@
99 USE_SEE = 0
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.1.1
104 SSLINCDIR = $(SSLDIR)\inc32
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)\out32dll
107 !else
108 SSLLIBDIR = $(SSLDIR)\out32
109 !endif
110 SSLLFLAGS = /nologo /opt:ref /debug
111 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
112 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113 !message Using 'x64' platform for OpenSSL...
114 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
115 # SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
116 SSLCONFIG = VC-WIN64A no-asm
117 !if $(FOSSIL_DYNAMIC_BUILD)!=0
118 SSLCONFIG = $(SSLCONFIG) shared
119 !else
120 SSLCONFIG = $(SSLCONFIG) no-shared
121 !endif
122 SSLSETUP = ms\do_win64a.bat
123 !if $(FOSSIL_DYNAMIC_BUILD)!=0
124 SSLNMAKE = ms\ntdll.mak all
125 !else
126 SSLNMAKE = ms\nt.mak all
127 !endif
128 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
129 !if $(FOSSIL_DYNAMIC_BUILD)==0
130 SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
131 !endif
132 !elseif "$(PLATFORM)"=="ia64"
133 !message Using 'ia64' platform for OpenSSL...
134 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
135 # SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
136 SSLCONFIG = VC-WIN64I no-asm
137 !if $(FOSSIL_DYNAMIC_BUILD)!=0
138 SSLCONFIG = $(SSLCONFIG) shared
139 !else
140 SSLCONFIG = $(SSLCONFIG) no-shared
141 !endif
142 SSLSETUP = ms\do_win64i.bat
143 !if $(FOSSIL_DYNAMIC_BUILD)!=0
144 SSLNMAKE = ms\ntdll.mak all
145 !else
146 SSLNMAKE = ms\nt.mak all
147 !endif
148 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
149 !if $(FOSSIL_DYNAMIC_BUILD)==0
150 SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
151 !endif
152 !else
153 !message Assuming 'x86' platform for OpenSSL...
154 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
155 # SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
156 SSLCONFIG = VC-WIN32 no-asm
157 !if $(FOSSIL_DYNAMIC_BUILD)!=0
158 SSLCONFIG = $(SSLCONFIG) shared
159 !else
160 SSLCONFIG = $(SSLCONFIG) no-shared
161 !endif
162 SSLSETUP = ms\do_ms.bat
163 !if $(FOSSIL_DYNAMIC_BUILD)!=0
164 SSLNMAKE = ms\ntdll.mak all
165 !else
166 SSLNMAKE = ms\nt.mak all
167 !endif
168 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
169 !if $(FOSSIL_DYNAMIC_BUILD)==0
170 SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
171 !endif
172 !endif
173 !endif
174
175 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -754,16 +718,11 @@
754 @echo Building OpenSSL from "$(SSLDIR)"...
755 !if "$(PERLDIR)" != ""
756 @set PATH=$(PERLDIR);$(PATH)
757 !endif
758 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
759 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
760 !if $(FOSSIL_ENABLE_WINXP)!=0
761 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
762 !else
763 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
764 !endif
765 !endif
766
767 !if $(FOSSIL_ENABLE_MINIZ)==0
768 !if $(FOSSIL_BUILD_ZLIB)!=0
769 APPTARGETS = $(APPTARGETS) zlib
770
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -99,77 +99,41 @@
99 USE_SEE = 0
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.1.1
104 SSLINCDIR = $(SSLDIR)\include
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)
107 !else
108 SSLLIBDIR = $(SSLDIR)
109 !endif
110 SSLLFLAGS = /nologo /opt:ref /debug
111 SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
112 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113 !message Using 'x64' platform for OpenSSL...
114 SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
115 !if $(FOSSIL_DYNAMIC_BUILD)!=0
116 SSLCONFIG = $(SSLCONFIG) shared
117 !else
118 SSLCONFIG = $(SSLCONFIG) no-shared
119 !endif
120 !elseif "$(PLATFORM)"=="ia64"
121 !message Using 'ia64' platform for OpenSSL...
122 SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
123 !if $(FOSSIL_DYNAMIC_BUILD)!=0
124 SSLCONFIG = $(SSLCONFIG) shared
125 !else
126 SSLCONFIG = $(SSLCONFIG) no-shared
127 !endif
128 !else
129 !message Assuming 'x86' platform for OpenSSL...
130 SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
131 !if $(FOSSIL_DYNAMIC_BUILD)!=0
132 SSLCONFIG = $(SSLCONFIG) shared
133 !else
134 SSLCONFIG = $(SSLCONFIG) no-shared
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
135 !endif
136 !endif
137 !endif
138
139 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -754,16 +718,11 @@
718 @echo Building OpenSSL from "$(SSLDIR)"...
719 !if "$(PERLDIR)" != ""
720 @set PATH=$(PERLDIR);$(PATH)
721 !endif
722 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
723 @pushd "$(SSLDIR)" && $(MAKE) && popd
 
 
 
 
 
724 !endif
725
726 !if $(FOSSIL_ENABLE_MINIZ)==0
727 !if $(FOSSIL_BUILD_ZLIB)!=0
728 APPTARGETS = $(APPTARGETS) zlib
729
M www/changes.wiki
+9 -5
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,23 +1,28 @@
11
 <title>Change Log</title>
22
33
 <a name='v2_7'></a>
4
-<h2>Changes for Version 2.7 (2018-09-??)</h2>
4
+<h2>Changes for Version 2.7 (2018-09-22)</h2>
55
66
 * Add the [./alerts.md|email alerts] feature for commits, ticket
77
 changes, wiki changes, forum posts, and announcements. This is
8
- still a work in progress. It works, but it is not as easy to
8
+ still a work in progress. It is functional, but it is not as easy to
99
 setup and use as it ought to be.
1010
 * Add the [./forum.wiki|discussion forum] feature.
1111
 * Add new user capabilities letters needed to support alerts and forum.
1212
 Formerly, user capabilities were letters from &#91;a-z&#93;, but with the
1313
 enhancements, the supply of lower case letters was exhausted.
1414
 User capabilities are now letters in &#91;a-zA-Z0-9&#93;.
15
- * The default skin is now responsive, providing better layout on
15
+ * The built-in skins are now responsive, providing better layout on
1616
 small screens, including mobile devices.
1717
 * The default skin now includes a hamburger menu that is generated
1818
 by the [/sitemap] page.
19
+ * All of the built-in skins now use a
20
+ [https://en.wikipedia.org/wiki/Content_Security_Policy|Content Security Policy (CSP)]
21
+ to help prevent cross-site injection and forgery attacks. There are no known
22
+ vulnerabilities in Fossil. The added CSP does not fix anything; it merely adds
23
+ another layer of defense.
1924
 * The [/sitemap] and other list pages show as multiple columns if
2025
 the viewing window is wide enough.
2126
 * There is an optional "js" file for each skin that can be used to
2227
 hold javascript. This file can be loaded by reference or can be
2328
 included in the header or footer.
@@ -24,12 +29,11 @@
2429
 * Add the [./backoffice.md|backoffice].
2530
 * Update internal Unicode character tables, used in regular expression
2631
 handling, from version 10.0 to 11.0.
2732
 * Improvements to the "Security Audit" administration page
2833
 * Added the [/help?cmd=branch|fossil branch current] command.
29
- * Update the built-in SQLite to version 3.25.0.
30
- * Add support for TLS 1.3, when compiled with OpenSSL 1.1.1.
34
+ * Update the built-in SQLite to version 3.25.1.
3135
 * Some code and interfaces are in place to support sending and
3236
 receiving email directly via SMTP, but this feature is not yet
3337
 complete or ready for production use.
3438
3539
 <a name='v2_6'></a>
3640
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,23 +1,28 @@
1 <title>Change Log</title>
2
3 <a name='v2_7'></a>
4 <h2>Changes for Version 2.7 (2018-09-??)</h2>
5
6 * Add the [./alerts.md|email alerts] feature for commits, ticket
7 changes, wiki changes, forum posts, and announcements. This is
8 still a work in progress. It works, but it is not as easy to
9 setup and use as it ought to be.
10 * Add the [./forum.wiki|discussion forum] feature.
11 * Add new user capabilities letters needed to support alerts and forum.
12 Formerly, user capabilities were letters from &#91;a-z&#93;, but with the
13 enhancements, the supply of lower case letters was exhausted.
14 User capabilities are now letters in &#91;a-zA-Z0-9&#93;.
15 * The default skin is now responsive, providing better layout on
16 small screens, including mobile devices.
17 * The default skin now includes a hamburger menu that is generated
18 by the [/sitemap] page.
 
 
 
 
 
19 * The [/sitemap] and other list pages show as multiple columns if
20 the viewing window is wide enough.
21 * There is an optional "js" file for each skin that can be used to
22 hold javascript. This file can be loaded by reference or can be
23 included in the header or footer.
@@ -24,12 +29,11 @@
24 * Add the [./backoffice.md|backoffice].
25 * Update internal Unicode character tables, used in regular expression
26 handling, from version 10.0 to 11.0.
27 * Improvements to the "Security Audit" administration page
28 * Added the [/help?cmd=branch|fossil branch current] command.
29 * Update the built-in SQLite to version 3.25.0.
30 * Add support for TLS 1.3, when compiled with OpenSSL 1.1.1.
31 * Some code and interfaces are in place to support sending and
32 receiving email directly via SMTP, but this feature is not yet
33 complete or ready for production use.
34
35 <a name='v2_6'></a>
36
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,23 +1,28 @@
1 <title>Change Log</title>
2
3 <a name='v2_7'></a>
4 <h2>Changes for Version 2.7 (2018-09-22)</h2>
5
6 * Add the [./alerts.md|email alerts] feature for commits, ticket
7 changes, wiki changes, forum posts, and announcements. This is
8 still a work in progress. It is functional, but it is not as easy to
9 setup and use as it ought to be.
10 * Add the [./forum.wiki|discussion forum] feature.
11 * Add new user capabilities letters needed to support alerts and forum.
12 Formerly, user capabilities were letters from &#91;a-z&#93;, but with the
13 enhancements, the supply of lower case letters was exhausted.
14 User capabilities are now letters in &#91;a-zA-Z0-9&#93;.
15 * The built-in skins are now responsive, providing better layout on
16 small screens, including mobile devices.
17 * The default skin now includes a hamburger menu that is generated
18 by the [/sitemap] page.
19 * All of the built-in skins now use a
20 [https://en.wikipedia.org/wiki/Content_Security_Policy|Content Security Policy (CSP)]
21 to help prevent cross-site injection and forgery attacks. There are no known
22 vulnerabilities in Fossil. The added CSP does not fix anything; it merely adds
23 another layer of defense.
24 * The [/sitemap] and other list pages show as multiple columns if
25 the viewing window is wide enough.
26 * There is an optional "js" file for each skin that can be used to
27 hold javascript. This file can be loaded by reference or can be
28 included in the header or footer.
@@ -24,12 +29,11 @@
29 * Add the [./backoffice.md|backoffice].
30 * Update internal Unicode character tables, used in regular expression
31 handling, from version 10.0 to 11.0.
32 * Improvements to the "Security Audit" administration page
33 * Added the [/help?cmd=branch|fossil branch current] command.
34 * Update the built-in SQLite to version 3.25.1.
 
35 * Some code and interfaces are in place to support sending and
36 receiving email directly via SMTP, but this feature is not yet
37 complete or ready for production use.
38
39 <a name='v2_6'></a>
40
M www/index.wiki
+1 -1
--- www/index.wiki
+++ www/index.wiki
@@ -34,11 +34,11 @@
3434
 Fossil has a built-in,
3535
 [https://fossil-scm.org/skins/index.html | themeable],
3636
 and intuitive [./webui.wiki | web interface]
3737
 with a rich variety of information pages
3838
 ([./webpage-ex.md|examples]) promoting situational awareness.
39
-
39
+ <p>
4040
 This entire website is just a running instance of Fossil.
4141
 The pages you see here are all [./wikitheory.wiki | wiki] or
4242
 [./embeddeddoc.wiki | embedded documentation] or (in the case of
4343
 the [/uv/download.html|download] page)
4444
 [./unvers.wiki | unversioned files].
4545
--- www/index.wiki
+++ www/index.wiki
@@ -34,11 +34,11 @@
34 Fossil has a built-in,
35 [https://fossil-scm.org/skins/index.html | themeable],
36 and intuitive [./webui.wiki | web interface]
37 with a rich variety of information pages
38 ([./webpage-ex.md|examples]) promoting situational awareness.
39
40 This entire website is just a running instance of Fossil.
41 The pages you see here are all [./wikitheory.wiki | wiki] or
42 [./embeddeddoc.wiki | embedded documentation] or (in the case of
43 the [/uv/download.html|download] page)
44 [./unvers.wiki | unversioned files].
45
--- www/index.wiki
+++ www/index.wiki
@@ -34,11 +34,11 @@
34 Fossil has a built-in,
35 [https://fossil-scm.org/skins/index.html | themeable],
36 and intuitive [./webui.wiki | web interface]
37 with a rich variety of information pages
38 ([./webpage-ex.md|examples]) promoting situational awareness.
39 <p>
40 This entire website is just a running instance of Fossil.
41 The pages you see here are all [./wikitheory.wiki | wiki] or
42 [./embeddeddoc.wiki | embedded documentation] or (in the case of
43 the [/uv/download.html|download] page)
44 [./unvers.wiki | unversioned files].
45

Keyboard Shortcuts

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