summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrandomdan <randomdan@localhost>2013-04-13 17:35:26 +0000
committerrandomdan <randomdan@localhost>2013-04-13 17:35:26 +0000
commit59a05f501e1dbdfe9a0fa2eb79cb5f5c1f97390f (patch)
tree40d8a8a0d316f96c1d5aa9f32e1b1af3c125db20
parentAddress ambiguity converting to long int on 32bit (diff)
downloadproject2-59a05f501e1dbdfe9a0fa2eb79cb5f5c1f97390f.tar.bz2
project2-59a05f501e1dbdfe9a0fa2eb79cb5f5c1f97390f.tar.xz
project2-59a05f501e1dbdfe9a0fa2eb79cb5f5c1f97390f.zip
Don't precache variable conversion as it causes some currently inexplicable problem with sessions
Call FCGI finish to flush output to the client before calling post and iteration tasks
-rw-r--r--project2/cgi/p2webFCgi.cpp3
-rw-r--r--project2/common/variableType.cpp1
2 files changed, 2 insertions, 2 deletions
diff --git a/project2/cgi/p2webFCgi.cpp b/project2/cgi/p2webFCgi.cpp
index 7dac2cc..e0782e0 100644
--- a/project2/cgi/p2webFCgi.cpp
+++ b/project2/cgi/p2webFCgi.cpp
@@ -46,11 +46,12 @@ main(void)
alarm(0);
cgicc::FCgiIO IO(request);
cgiServe(&IO, &env, IO, &IO);
- alarm(60);
+ FCGX_Finish_r(&request);
LoaderBase::onAllComponents(boost::bind(&ComponentLoader::onIteration, _1));
if (time(NULL) > lastPeriodic + periodicDelay) {
p2webPeriodic();
}
+ alarm(60);
}
return 0;
}
diff --git a/project2/common/variableType.cpp b/project2/common/variableType.cpp
index 5eab163..25ce800 100644
--- a/project2/common/variableType.cpp
+++ b/project2/common/variableType.cpp
@@ -52,7 +52,6 @@ VariableType
VariableType::make(const Glib::ustring & src, const VT_typeID format)
{
VariableType vt(src);
- vt.convertCache = src;
switch (format) {
default:
case DefaultType: