HC software CastleDoctrine

Brought to you by: jcr13

CastleDoctrine Merge Request #1: caching features and security fixes (open)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

Macil wants to merge 8 commits from /u/agentme/CastleDoctrine/ to default, 2014-01-28

cache stuff and fixes that I emailed you about

Commit	Date
[254362] (servercache, tip) by Chris Cowan Merge.	2014-01-28 14:39:22	Tree
[8e5abc] by Chris Cowan Made listing robbery logs able to work on cache without touching MySQL when first page is browsed and no search query is entered. cd_isAdmin(), cd_getCharacterName(), cd_processStaleCheckouts(), and cd_listLoggedRobberies() now cache data they use, and don't need to hit MySQL always.	2014-01-28 14:34:04	Tree
[b8dc10] by Chris Cowan Made cd_verifyTransaction() and cd_checkForFlush() be able to rely on cache and avoid accessing the SQL database always. cd_returnBackpack() was renamed to cd_returnStaleBackpacks() and modified to iterate through its results first so it could check for more up-to-date last_owner_action_time values. This makes it a little less efficient, but the change allows cd_verifyTransaction() to only need to update last_owner_action_time in the cache, and cd_returnStaleBackpacks() runs much less often.	2014-01-28 12:52:56	Tree
[bec4f5] by Chris Cowan Add Cache class, and cache configuration settings in settings.php.	2014-01-28 10:53:51	Tree
[38987f] by Chris Cowan Fix XSS vulnerability in admin log viewer.	2014-01-28 10:36:13	Tree
[02ecf2] by Chris Cowan Fix warning when setting error handler.	2014-01-26 21:54:09	Tree
[211ba5] by Chris Cowan Fix XSRF vulnerabilities.	2014-01-26 21:52:10	Tree
[a5ac10] by Chris Cowan Add missing hg ignore entries.	2014-01-25 05:35:54	Tree

Discussion

Macil - 2014-01-28

Argh, I must have done something wrong. [6125e7] (Client automatic robbery notification) and [be911c] should not be part of this merge request. Only the stuff relating to server.php, settings.php, and the addition of cache.php should be here.

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Log in to post a comment.