From 5528dc60f565ef1371b799ff1ef63634bf20af58 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Wed, 17 Aug 2016 17:24:57 +1000
Subject: [PATCH] Issue #845 data rate limits

Converted to long minimum data rather than the numerically sensitive data rate.
---
 .../src/main/java/org/eclipse/jetty/server/HttpInput.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
index b0c185bb698..634aa747574 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
@@ -154,11 +154,11 @@ public class HttpInput extends ServletInputStream implements Runnable
             if (minRequestDataRate>0 && _firstByteTimeStamp!=-1)
             {
                 long period=System.nanoTime()-_firstByteTimeStamp;
-                if (period>=1000)
+                if (period>0)
                 {
-                    double data_rate = _contentArrived / (((double)period)/TimeUnit.SECONDS.toNanos(1));
-                    if (data_rate<minRequestDataRate)
-                        throw new BadMessageException(HttpStatus.REQUEST_TIMEOUT_408,String.format("Request Data rate %f < %d B/s",data_rate,minRequestDataRate));
+                    long minimum_data = minRequestDataRate * TimeUnit.NANOSECONDS.toMillis(period)/TimeUnit.SECONDS.toMillis(1);
+                    if (_contentArrived<minimum_data)
+                        throw new BadMessageException(HttpStatus.REQUEST_TIMEOUT_408,String.format("Request data rate < %d B/s",minRequestDataRate));
                 }
             }