diff options
| author | Greg Wilkins | 2011-11-15 12:19:46 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2011-11-15 12:19:46 +0000 |
| commit | edbea0c613c85d138d923df36d78d3ca066aca43 (patch) | |
| tree | b59f9b73139fff3fa1799191468d5d90d0e77206 /jetty-http/src | |
| parent | 9beadb5f3ace58be5dfdfe53e454ad6de1333175 (diff) | |
| download | org.eclipse.jetty.project-edbea0c613c85d138d923df36d78d3ca066aca43.tar.gz org.eclipse.jetty.project-edbea0c613c85d138d923df36d78d3ca066aca43.tar.xz org.eclipse.jetty.project-edbea0c613c85d138d923df36d78d3ca066aca43.zip | |
363757 partial fix
Diffstat (limited to 'jetty-http/src')
| -rw-r--r-- | jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java | 3 | ||||
| -rw-r--r-- | jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java index cc978dfaf3..e9a7b63dfd 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java @@ -969,6 +969,9 @@ public class HttpGenerator extends AbstractGenerator int size = _content.length(); _bufferChunked = true; + if (_header == null) + _header = _buffers.getHeader(); + // if we need CRLF add this to header if (_needCRLF) { diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java index f1725ccc64..d27bf5913e 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java @@ -297,7 +297,9 @@ public class HttpParser implements Parser ex=e; } - if (filled < 0 ) + if (filled > 0 ) + progress++; + else if (filled < 0 ) { _persistent=false; |