2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 126d52e1d..d66ca1d4f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 ver 0.16.7 (2011/??/??)
+* output:
+  - httpd: fix excessive buffering
 
 
 ver 0.16.6 (2011/12/01)
diff --git a/src/timer.c b/src/timer.c
index 0b3b1198a..ba82fc522 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -81,7 +81,7 @@ timer_delay(const Timer *timer)
 	if (delay > G_MAXINT)
 		delay = G_MAXINT;
 
-	return delay / 1000;
+	return delay;
 }
 
 void timer_sync(Timer *timer)