summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Noble <pixel@nobis-crew.org>2013-08-02 15:52:29 -0700
committerNicolas Noble <pixel@nobis-crew.org>2013-08-02 15:52:29 -0700
commitf416d651f3d6551aa0efbcdb8b5838269de9bff3 (patch)
tree3fa11ba2d90362fb60e5ea727310a115f5ed0cf1
parentfdbddaa4873fda6e83b8894dd58f166ebde795c3 (diff)
Forgot to pass on the timeout event here.
-rw-r--r--src/BLua.cc1
-rw-r--r--src/HttpServer.cc2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/BLua.cc b/src/BLua.cc
index 32947cd..9a2140f 100644
--- a/src/BLua.cc
+++ b/src/BLua.cc
@@ -564,6 +564,7 @@ void Balau::Lua::load(const String & s, bool docall) throw (GeneralException) {
}
void Balau::Lua::dumpvars(IO<Handle> h, const String & prefix, int i) {
+ Task::SimpleContext sc;
h->writeString(prefix);
h->writeString(" = {\n");
dumpvars_r(h, i);
diff --git a/src/HttpServer.cc b/src/HttpServer.cc
index 2bc0710..140fe78 100644
--- a/src/HttpServer.cc
+++ b/src/HttpServer.cc
@@ -488,7 +488,7 @@ bool Balau::HttpWorker::handleClient() {
while (true) {
try {
- m_strm->forceRead(postData, length);
+ m_strm->forceRead(postData, length, &evtTimeout);
break;
}
catch (EAgain) {