2020-08-17 09:16:14
— part of check-in
[253dbd15e2]
on branch sec2020
— Prohibit redirects from HTTP or HTTPS over to SSH or FILE.
Fix for ticket [61613b0a9cf843b6].
(user:
drh
size: 17308)
2020-08-19 01:07:57
— part of check-in
[fe1264d35d]
on branch sec2020-2.12-patch
— Cherrypick key fixes from the sec2020 branch in order to devise a
minimal patch to get us to version 2.12.1.
(user:
drh
size: 17308)
2020-08-20 13:01:51
— part of check-in
[40feec3291]
on branch branch-2.12
— 2.12.1 release candidate with security fixes.
(user:
drh
size: 17308)
2020-08-20 13:24:41
— part of check-in
[c58877d6f2]
on branch branch-2.11
— Version 2.11.2
(user:
drh
size: 17308)
2020-08-24 23:24:02
— part of check-in
[f741baa6be]
on branch trunk
— Merge miscellanous auxiliary defenses and security enhancements. This
check-in is not needed to fix any problems that are not already fixed in
version 2.12.1. It merely provides additional defense in depth.
(user:
drh
size: 17308)
2020-08-26 12:44:22
— part of check-in
[4f5bda658f]
on branch wiki-history
— Merge in trunk (version-2.11.2)
(user:
george
size: 17308)
2021-02-14 21:28:19
— part of check-in
[0516f4d3c8]
on branch ui-local-diff
— Brought graham's ui-local-diff branch up to date with respect to trunk.
This is not a simple merge, because it had to accommodate several
conflicting changes, so it needs to be re-checked for sanity before
being merged down to trunk. Also, some of the changes I made simply
reduce the size of the resulting diff relative to trunk and need to be
reverted; these are primarily 2-line splits of "else/if" so the
branch-specific change doesn't repeat the following "if" condition,
which is now the "else if" condition. I think this sort of thing aids
understanding of the diff, even though it breaks the style guidelines.
(user:
wyoung
size: 17308)
2021-03-01 07:37:26
— part of check-in
[ea28708f85]
on branch artifact-view-links
— Merged trunk changes in. Only needed to track my own rename of
branch_of_rid() to branch_of_ckin_rid()
(user:
wyoung
size: 17308)