Fossil

Check-in [8ac66ef33b]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Check-in [344a3331d34d896776] breaks the build when using openssl-1.0.1 so back it out for now. (Added:) The content is correct, but this check-in shows an unexpected merge. I don't know yet if the extra merge is a bug in fossil or a PBKAC. This check-in was originally to trunk but is now moved to a branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | bad-merge
Files: files | file ages | folders
SHA3-256: 8ac66ef33b464d280e9ec00e3b5223b1c2c78a056405348dcd4d255fc226923c
User & Date: drh 2019-05-18 20:50:06
Original Comment: Check-in [344a3331d34d896776] breaks the build when using openssl-1.0.1 so back it out for now.
Context
2019-05-18
20:55
Merge the windows build fix from trunk. ... (Closed-Leaf check-in: d99debe8ee user: drh tags: bad-merge)
20:50
Check-in [344a3331d34d896776] breaks the build when using openssl-1.0.1 so back it out for now. (Added:) The content is correct, but this check-in shows an unexpected merge. I don't know yet if the extra merge is a bug in fossil or a PBKAC. This check-in was originally to trunk but is now moved to a branch. ... (check-in: 8ac66ef33b user: drh tags: bad-merge)
00:19
Fix harmless compiler warning. ... (check-in: 420244cbd3 user: mistachkin tags: trunk)
2019-05-17
23:34
On Windows, avoid using BIO_ptr_ctrl with OpenSSL 1.1.1b as it does not appear to work as expected. ... (check-in: 344a3331d3 user: mistachkin tags: trunk)
2019-05-13
21:48
Merge trunk ... (Closed-Leaf check-in: 91a0d5a55f user: jan.nijtmans tags: openssl-1.1)
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to src/makemake.tcl.

Changes to win/Makefile.mingw.

Changes to win/Makefile.mingw.mistachkin.

Changes to win/Makefile.msc.