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

Issue #1074 javadoc

This commit is contained in:
Greg Wilkins 2016-11-08 16:26:03 +11:00
parent a7048a325a
commit 62331ce8f0
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,6 +260,7 @@ public class HttpInput extends ServletInputStream implements Runnable
int l;
synchronized (_inputQ)
{
// Setup blocking only if not async
if (!isAsync())
{
if (_blockUntil == 0)
@ -270,6 +271,7 @@ public class HttpInput extends ServletInputStream implements Runnable
}
}
// Caclulate minimum request rate for DOS protection
long minRequestDataRate = _channelState.getHttpChannel().getHttpConfiguration().getMinRequestDataRate();
if (minRequestDataRate > 0 && _firstByteTimeStamp != -1)
{
@ -282,6 +284,7 @@ public class HttpInput extends ServletInputStream implements Runnable
}
}
// Consume content looking for bytes to read
while (true)
{
Content item = nextContent();
@ -297,9 +300,13 @@ public class HttpInput extends ServletInputStream implements Runnable
break;
}
// No content, so should we block?
if (!_state.blockForContent(this))
{
// Not blocking, so what should we return?
l = _state.noContent();
// If EOF do we need to wake for allDataRead callback?
if (l<0)
wake = _channelState.onReadEof();
break;
@ -801,8 +808,6 @@ public class HttpInput extends ServletInputStream implements Runnable
synchronized (_inputQ)
{
listener = _listener;
if (_channelState.isAsyncComplete())
return;
if (_state == EOF)
return;
@ -837,10 +842,7 @@ public class HttpInput extends ServletInputStream implements Runnable
}
}
else if (content==null)
{
LOG.warn("spurious run!");
return;
}
throw new IllegalStateException();
}
}