Merge remote-tracking branch 'origin/master' into jetty-9.1

This commit is contained in:
Greg Wilkins 2013-08-30 14:45:42 +10:00
commit 4d6fd407b5

View File

@ -845,7 +845,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable
int len=0; int len=0;
while (len<_buffer.capacity() && !_eof) while (len<_buffer.capacity() && !_eof)
{ {
int r=_in.read(_buffer.array(),0,_buffer.capacity()-len); int r=_in.read(_buffer.array(),_buffer.arrayOffset()+len,_buffer.capacity()-len);
if (r<0) if (r<0)
_eof=true; _eof=true;
else else