diff options
| author | Greg Wilkins | 2013-08-30 04:45:42 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2013-08-30 04:45:42 +0000 |
| commit | 4d6fd407b549ca2eda4f6d1dd0346e192febb242 (patch) | |
| tree | 5b575373ada97a813153c6dda736341ff49b695f | |
| parent | b5d3aeab0fc5abe84f0426c63d21353835718bbd (diff) | |
| parent | 4358302ce0fdc5c85805a27e01b4ddeb29dfef5e (diff) | |
| download | org.eclipse.jetty.project-4d6fd407b549ca2eda4f6d1dd0346e192febb242.tar.gz org.eclipse.jetty.project-4d6fd407b549ca2eda4f6d1dd0346e192febb242.tar.xz org.eclipse.jetty.project-4d6fd407b549ca2eda4f6d1dd0346e192febb242.zip | |
Merge remote-tracking branch 'origin/master' into jetty-9.1
| -rw-r--r-- | jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java index 8c786e5342..dd0fd8228a 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java @@ -845,7 +845,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable int len=0; 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) _eof=true; else |