summaryrefslogtreecommitdiff
path: root/src/HttpServerCommand.cc
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2011-08-10 01:17:28 +0900
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2011-08-10 01:17:28 +0900
commite8e3a6f259ab74c486aec9b5ea95d3e1f5068f6c (patch)
tree81530df222473d79cf39e007729b0d882441ebfb /src/HttpServerCommand.cc
parent97f34ab6682d83d9a0265a4291b44eaf45703493 (diff)
wallclock is now retrieved using global::wallclock() call.
This is necessary to avoid global variable initialization order problem.
Diffstat (limited to 'src/HttpServerCommand.cc')
-rw-r--r--src/HttpServerCommand.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/HttpServerCommand.cc b/src/HttpServerCommand.cc
index 1fde0844..8306ad15 100644
--- a/src/HttpServerCommand.cc
+++ b/src/HttpServerCommand.cc
@@ -109,7 +109,7 @@ bool HttpServerCommand::execute()
try {
if(socket_->isReadable(0) ||
!httpServer_->getSocketRecvBuffer()->bufferEmpty()) {
- timeoutTimer_ = global::wallclock;
+ timeoutTimer_ = global::wallclock();
SharedHandle<HttpHeader> header;
header = httpServer_->receiveRequest();
@@ -144,7 +144,7 @@ bool HttpServerCommand::execute()
e_->setNoWait(true);
return true;
} else {
- if(timeoutTimer_.difference(global::wallclock) >= 30) {
+ if(timeoutTimer_.difference(global::wallclock()) >= 30) {
A2_LOG_INFO("HTTP request timeout.");
return true;
} else {