Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #845 data rate limits 

use nanotime
This commit is contained in:
Greg Wilkins 2016-08-16 23:15:30 +10:00
parent d4ebdd6875
commit a60fe5e523
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
View File

@ -25,6 +25,7 @@ import java.util.ArrayDeque;
import java.util.Deque;
import java.util.Objects;
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import javax.servlet.ReadListener;
@ -146,18 +147,16 @@ public class HttpInput extends ServletInputStream implements Runnable
{
synchronized (_inputQ)
{
long now=System.currentTimeMillis();
if (_blockingTimeoutAt>=0 && !isAsync())
_blockingTimeoutAt=now+getHttpChannelState().getHttpChannel().getHttpConfiguration().getBlockingTimeout();
_blockingTimeoutAt=System.currentTimeMillis()+getHttpChannelState().getHttpChannel().getHttpConfiguration().getBlockingTimeout();
int minRequestDataRate=_channelState.getHttpChannel().getHttpConfiguration().getMinRequestDataRate();
if (minRequestDataRate>0 && _firstByteTimeStamp!=-1)
{
long period=now-_firstByteTimeStamp;
long period=System.nanoTime()-_firstByteTimeStamp;
if (period>=1000)
{
double data_rate = _contentArrived / (0.001*period);
double data_rate = _contentArrived / ((1.0*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));
}
@ -432,7 +431,7 @@ public class HttpInput extends ServletInputStream implements Runnable
synchronized (_inputQ)
{
if (_firstByteTimeStamp==-1)
_firstByteTimeStamp=System.currentTimeMillis();
_firstByteTimeStamp=System.nanoTime();
_contentArrived+=item.remaining();
_inputQ.offer(item);
if (LOG.isDebugEnabled())