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

Merge remote-tracking branch 'origin/jetty-9.4.x'

This commit is contained in:
Greg Wilkins 2016-08-03 18:49:48 +10:00
parent a5a5098d90 d0101dc81a
commit e33b549c7f
2 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
View File

@ -146,6 +146,12 @@ public class HttpOutput extends ServletOutputStream implements Runnable
_state.set(OutputState.OPEN);
}
private boolean isLastContentToWrite(int len)
{
_written+=len;
return _channel.getResponse().isAllContentWritten(_written);
}
public boolean isAllContentWritten()
{
return _channel.getResponse().isAllContentWritten(_written);
@ -370,9 +376,6 @@ public class HttpOutput extends ServletOutputStream implements Runnable
@Override
public void write(byte[] b, int off, int len) throws IOException
{
_written+=len;
boolean complete=_channel.getResponse().isAllContentWritten(_written);
// Async or Blocking ?
while(true)
{
@ -390,7 +393,8 @@ public class HttpOutput extends ServletOutputStream implements Runnable
continue;
// Should we aggregate?
if (!complete && len<=_commitSize)
boolean last = isLastContentToWrite(len);
if (!last && len<=_commitSize)
{
if (_aggregate == null)
_aggregate = _channel.getByteBufferPool().acquire(getBufferSize(), _interceptor.isOptimizedForDirectBuffers());
@ -412,7 +416,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable
}
// Do the asynchronous writing from the callback
new AsyncWrite(b,off,len,complete).iterate();
new AsyncWrite(b,off,len,last).iterate();
return;
case PENDING:
@ -435,7 +439,8 @@ public class HttpOutput extends ServletOutputStream implements Runnable
// Should we aggregate?
int capacity = getBufferSize();
if (!complete && len<=_commitSize)
boolean last = isLastContentToWrite(len);
if (!last && len<=_commitSize)
{
if (_aggregate == null)
_aggregate = _channel.getByteBufferPool().acquire(capacity, _interceptor.isOptimizedForDirectBuffers());
@ -455,10 +460,10 @@ public class HttpOutput extends ServletOutputStream implements Runnable
// flush any content from the aggregate
if (BufferUtil.hasContent(_aggregate))
{
write(_aggregate, complete && len==0);
write(_aggregate, last && len==0);
// should we fill aggregate again from the buffer?
if (len>0 && !complete && len<=_commitSize && len<=BufferUtil.space(_aggregate))
if (len>0 && !last && len<=_commitSize && len<=BufferUtil.space(_aggregate))
{
BufferUtil.append(_aggregate, b, off, len);
return;
@ -481,22 +486,19 @@ public class HttpOutput extends ServletOutputStream implements Runnable
view.limit(l+Math.min(len,getBufferSize()));
view.position(l);
}
write(view,complete);
write(view,last);
}
else if (complete)
else if (last)
{
write(BufferUtil.EMPTY_BUFFER,true);
}
if (complete)
if (last)
closed();
}
public void write(ByteBuffer buffer) throws IOException
{
_written+=buffer.remaining();
boolean complete=_channel.getResponse().isAllContentWritten(_written);
// Async or Blocking ?
while(true)
{
@ -514,7 +516,8 @@ public class HttpOutput extends ServletOutputStream implements Runnable
continue;
// Do the asynchronous writing from the callback
new AsyncWrite(buffer,complete).iterate();
boolean last = isLastContentToWrite(buffer.remaining());
new AsyncWrite(buffer,last).iterate();
return;
case PENDING:
@ -536,18 +539,19 @@ public class HttpOutput extends ServletOutputStream implements Runnable
// handle blocking write
int len=BufferUtil.length(buffer);
boolean last = isLastContentToWrite(len);
// flush any content from the aggregate
if (BufferUtil.hasContent(_aggregate))
write(_aggregate, complete && len==0);
write(_aggregate, last && len==0);
// write any remaining content in the buffer directly
if (len>0)
write(buffer, complete);
else if (complete)
write(buffer, last);
else if (last)
write(BufferUtil.EMPTY_BUFFER, true);
if (complete)
if (last)
closed();
}
@ -1009,6 +1013,13 @@ public class HttpOutput extends ServletOutputStream implements Runnable
private abstract class AsyncICB extends IteratingCallback
{
final boolean _last;
AsyncICB(boolean last)
{
_last=last;
}
@Override
protected void onCompleteSuccess()
{
@ -1025,6 +1036,8 @@ public class HttpOutput extends ServletOutputStream implements Runnable
case UNREADY:
if (!_state.compareAndSet(OutputState.UNREADY, OutputState.READY))
continue;
if (_last)
closed();
if (_channel.getState().onWritePossible())
_channel.execute(_channel);
break;
@ -1054,6 +1067,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable
public AsyncFlush()
{
super(false);
}
@Override
@ -1081,21 +1095,21 @@ public class HttpOutput extends ServletOutputStream implements Runnable
{
private final ByteBuffer _buffer;
private final ByteBuffer _slice;
private final boolean _complete;
private final int _len;
protected volatile boolean _completed;
public AsyncWrite(byte[] b, int off, int len, boolean complete)
public AsyncWrite(byte[] b, int off, int len, boolean last)
{
super(last);
_buffer=ByteBuffer.wrap(b, off, len);
_len=len;
// always use a view for large byte arrays to avoid JVM pooling large direct buffers
_slice=_len<getBufferSize()?null:_buffer.duplicate();
_complete=complete;
}
public AsyncWrite(ByteBuffer buffer, boolean complete)
public AsyncWrite(ByteBuffer buffer, boolean last)
{
super(last);
_buffer=buffer;
_len=buffer.remaining();
// Use a slice buffer for large indirect to avoid JVM pooling large direct buffers
@ -1106,7 +1120,6 @@ public class HttpOutput extends ServletOutputStream implements Runnable
_slice=_buffer.duplicate();
_buffer.position(_buffer.limit());
}
_complete=complete;
}
@Override
@ -1116,12 +1129,12 @@ public class HttpOutput extends ServletOutputStream implements Runnable
if (BufferUtil.hasContent(_aggregate))
{
_completed=_len==0;
write(_aggregate, _complete && _completed, this);
write(_aggregate, _last && _completed, this);
return Action.SCHEDULED;
}
// Can we just aggregate the remainder?
if (!_complete && _len<BufferUtil.space(_aggregate) && _len<_commitSize)
if (!_last && _len<BufferUtil.space(_aggregate) && _len<_commitSize)
{
int position = BufferUtil.flipToFill(_aggregate);
BufferUtil.put(_buffer,_aggregate);
@ -1136,7 +1149,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable
if (_slice==null)
{
_completed=true;
write(_buffer, _complete, this);
write(_buffer, _last, this);
return Action.SCHEDULED;
}
@ -1148,13 +1161,13 @@ public class HttpOutput extends ServletOutputStream implements Runnable
_buffer.position(pl);
_slice.position(p);
_completed=!_buffer.hasRemaining();
write(_slice, _complete && _completed, this);
write(_slice, _last && _completed, this);
return Action.SCHEDULED;
}
// all content written, but if we have not yet signal completion, we
// need to do so
if (_complete && !_completed)
if (_last && !_completed)
{
_completed=true;
write(BufferUtil.EMPTY_BUFFER, true, this);
@ -1165,14 +1178,6 @@ public class HttpOutput extends ServletOutputStream implements Runnable
LOG.debug("EOF of {}",this);
return Action.SUCCEEDED;
}
@Override
protected void onCompleteSuccess()
{
super.onCompleteSuccess();
if (_complete)
closed();
}
}
/**

4
jetty-util/src/main/java/org/eclipse/jetty/util/URIUtil.java
View File

@ -36,10 +36,6 @@ import org.eclipse.jetty.util.log.Logger;
* communications ability, but it does assist with query string
* formatting.
* </p>
* <p>
* UTF-8 encoding is used by default for % encoded characters. This
* may be overridden with the org.eclipse.jetty.util.URI.charset system property.
* </p>
*
* @see UrlEncoded
*/