From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 17 Oct 2010 20:01:57 +0000 (+0200)
Subject: Update core.
X-Git-Tag: xorg/1.0.2~25
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=9164a196eba306c6b16669d7847727afa4e37748;p=platal.git

Update core.

Also update the documentation of the parameters in platal.ini.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

diff --git a/configs/platal.ini b/configs/platal.ini
index 4fcbe42..7263936 100644
--- a/configs/platal.ini
+++ b/configs/platal.ini
@@ -77,8 +77,12 @@ robotstxt_disallowed_uris =
 ;   1 - DEBUG_BT: displays the backtraces (SQL, mailman, banana executions)
 ;   2 - DEBUG_VALID: checks that the html of the page is valid
 ;   4 - DEBUG_SMARTY: don't hide error reported during the execution of smarty
+;   8 - DEBUG_NOCACHE: disable data caching
+;  16 - DEBUG_SCRIPTCACHE: cache expires after the execution of the script (no caching
+;                          in session or via memcache)
 ;  - provided by xorg:
-; 256 - DEBUG_NOCACHE: don't cache db content in the session
+; 256 - DEBUG_NOCACHE: don't cache db content in the session (this feature as been moved
+;                      to the core and this flag is deprecated)
 ;
 ; debug = 0
 
@@ -125,6 +129,10 @@ baseurl = "https://www.example.org/"
 ; The charset to use when talking to the database
 ; dbcharset = "utf8"
 
+; $globals->core->memcache
+; List of space separated addresses of memcache servers
+memcache = ""
+
 ; $globals->static_cache_duration
 ; Cache duration for static content
 ; static_cache_duration = "604800"
diff --git a/core b/core
index 80c3b57..31dc3dd 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 80c3b5792bea15876ef8f79b8a64421733c1c001
+Subproject commit 31dc3dd3cdae22485061c3a1b6accdd732207dd4