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

2011-11-11 13:13:55 +11:00 · 2011-11-11 13:13:55 +11:00 · af70c3f609
parent 62e669ffa9 ac7caeadf9
commit af70c3f609
1 changed files with 4 additions and 1 deletions
--- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
+++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
@ -1009,7 +1009,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");