From b122f341a94bd9eb3dd6227dff27c1aa56848eed Mon Sep 17 00:00:00 2001 From: Georg Hopp Date: Wed, 15 Feb 2012 04:55:46 +0100 Subject: [PATCH] fix infinite busy loop in run --- ChangeLog | 8 ++++++-- src/server/run.c | 14 ++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93534a6..b09148e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,14 @@ +2012-02-15 04:55:46 +0100 Georg Hopp + + * fix infinite busy loop in run (HEAD, master) + 2012-02-15 04:44:38 +0100 Georg Hopp - * dynamically get and free buffer for response write pipe now (HEAD, master) + * dynamically get and free buffer for response write pipe now (origin/master, origin/HEAD) 2012-02-14 21:32:38 +0100 Georg Hopp - * increase write buffer (origin/master, origin/HEAD) + * increase write buffer 2012-02-13 21:27:47 +0100 Georg Hopp diff --git a/src/server/run.c b/src/server/run.c index 89cfca9..324a212 100644 --- a/src/server/run.c +++ b/src/server/run.c @@ -168,14 +168,12 @@ serverRun(Server this) message = (HttpMessage)streamWriterWrite(writer, fd); - if (NULL != message && writer->state == HTTP_RESPONSE_GET) { - if (httpMessageHasKeepAlive(message)) { - (this->fds)[i].events &= ~POLLOUT; - } - else { - delete(&message); - serverCloseConn(this, i); - } + if (NULL == message) { + (this->fds)[i].events &= ~POLLOUT; + } + else { + delete(&message); + serverCloseConn(this, i); } } }