diff options
| author | Jan Bartel | 2011-11-10 10:46:10 +0000 |
|---|---|---|
| committer | Jan Bartel | 2011-11-10 10:46:10 +0000 |
| commit | 3dace7fc86969da3336db009f1999bdba0e9b307 (patch) | |
| tree | 0ab695a70f152180a934523f3468179fd276055f /jetty-http | |
| parent | 2a6b8696d7f5f6bb8a8cad196bebcd904ea82a2c (diff) | |
| parent | ac7caeadf91a9cee9ceb6ea1cec0ba15d7b1ccaf (diff) | |
| download | org.eclipse.jetty.project-3dace7fc86969da3336db009f1999bdba0e9b307.tar.gz org.eclipse.jetty.project-3dace7fc86969da3336db009f1999bdba0e9b307.tar.xz org.eclipse.jetty.project-3dace7fc86969da3336db009f1999bdba0e9b307.zip | |
Merge remote-tracking branch 'origin/master' into jetty-8
Diffstat (limited to 'jetty-http')
| -rw-r--r-- | jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java | 5 |
1 files changed, 4 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 c2c4437783..4f4dfabac5 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 @@ -986,7 +986,10 @@ public class HttpGenerator extends AbstractGenerator } else { - // No space so lets use the header buffer. + // No space so lets use a header buffer. + if (_header == null) + _header = _buffers.getHeader(); + if (_needCRLF) { if (_header.length() > 0) throw new IllegalStateException("EOC"); |