repo/luan: src/org/eclipse/jetty/http/HttpGenerator.java annotate

annotate src/org/eclipse/jetty/http/HttpGenerator.java @ 965:866f2e801618

handle() returns void

author	Franklin Schmidt <fschmidt@gmail.com>
date	Fri, 14 Oct 2016 02:19:21 -0600
parents	cb78ee27b0e0
children	dbecd7faa1f5

rev	line source
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1 //
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	2 // ========================================================================
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	3 // Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	4 // ------------------------------------------------------------------------
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	5 // All rights reserved. This program and the accompanying materials
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	6 // are made available under the terms of the Eclipse Public License v1.0
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	7 // and Apache License v2.0 which accompanies this distribution.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	8 //
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	9 // The Eclipse Public License is available at
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	10 // http://www.eclipse.org/legal/epl-v10.html
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	11 //
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	12 // The Apache License v2.0 is available at
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	13 // http://www.opensource.org/licenses/apache2.0.php
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	14 //
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	15 // You may elect to redistribute this code under either of these licenses.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	16 // ========================================================================
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	17 //
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	18
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	19 package org.eclipse.jetty.http;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	20
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	21 import java.io.IOException;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	22 import java.io.InterruptedIOException;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	23
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	24 import org.eclipse.jetty.io.Buffer;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	25 import org.eclipse.jetty.io.BufferCache.CachedBuffer;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	26 import org.eclipse.jetty.io.BufferUtil;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	27 import org.eclipse.jetty.io.Buffers;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	28 import org.eclipse.jetty.io.ByteArrayBuffer;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	29 import org.eclipse.jetty.io.EndPoint;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	30 import org.eclipse.jetty.io.EofException;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	31 import org.eclipse.jetty.util.StringUtil;
884 cb78ee27b0e0 remove Server.getVersion() Franklin Schmidt <fschmidt@gmail.com> parents: 877 diff changeset	32 import org.eclipse.jetty.server.Server;
820 8e9db0bbf4f9 remove org.eclipse.jetty.util.log and upgrade slf4j Franklin Schmidt <fschmidt@gmail.com> parents: 802 diff changeset	33 import org.slf4j.Logger;
8e9db0bbf4f9 remove org.eclipse.jetty.util.log and upgrade slf4j Franklin Schmidt <fschmidt@gmail.com> parents: 802 diff changeset	34 import org.slf4j.LoggerFactory;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	35
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	36 /* ------------------------------------------------------------ */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	37 /**
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	38 * HttpGenerator. Builds HTTP Messages.
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	39 *
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	40 *
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	41 *
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	42 */
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	43 public class HttpGenerator extends AbstractGenerator
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	44 {
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	45 private static final Logger LOG = LoggerFactory.getLogger(HttpGenerator.class);
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	46
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	47 // Build cache of response lines for status
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	48 private static class Status
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	49 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	50 Buffer _reason;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	51 Buffer _schemeCode;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	52 Buffer _responseLine;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	53 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	54 private static final Status[] __status = new Status[HttpStatus.MAX_CODE+1];
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	55 static
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	56 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	57 int versionLength=HttpVersions.HTTP_1_1_BUFFER.length();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	58
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	59 for (int i=0;i<__status.length;i++)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	60 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	61 HttpStatus.Code code = HttpStatus.getCode(i);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	62 if (code==null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	63 continue;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	64 String reason=code.getMessage();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	65 byte[] bytes=new byte[versionLength+5+reason.length()+2];
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	66 HttpVersions.HTTP_1_1_BUFFER.peek(0,bytes, 0, versionLength);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	67 bytes[versionLength+0]=' ';
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	68 bytes[versionLength+1]=(byte)('0'+i/100);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	69 bytes[versionLength+2]=(byte)('0'+(i%100)/10);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	70 bytes[versionLength+3]=(byte)('0'+(i%10));
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	71 bytes[versionLength+4]=' ';
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	72 for (int j=0;j<reason.length();j++)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	73 bytes[versionLength+5+j]=(byte)reason.charAt(j);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	74 bytes[versionLength+5+reason.length()]=HttpTokens.CARRIAGE_RETURN;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	75 bytes[versionLength+6+reason.length()]=HttpTokens.LINE_FEED;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	76
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	77 __status[i] = new Status();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	78 __status[i]._reason=new ByteArrayBuffer(bytes,versionLength+5,bytes.length-versionLength-7,Buffer.IMMUTABLE);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	79 __status[i]._schemeCode=new ByteArrayBuffer(bytes,0,versionLength+5,Buffer.IMMUTABLE);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	80 __status[i]._responseLine=new ByteArrayBuffer(bytes,0,bytes.length,Buffer.IMMUTABLE);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	81 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	82 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	83
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	84 /* ------------------------------------------------------------------------------- */
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	85 public static Buffer getReasonBuffer(int code)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	86 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	87 Status status = code<__status.length?__status[code]:null;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	88 if (status!=null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	89 return status._reason;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	90 return null;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	91 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	92
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	93
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	94 // common _content
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	95 private static final byte[] LAST_CHUNK =
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	96 { (byte) '0', (byte) '\015', (byte) '\012', (byte) '\015', (byte) '\012'};
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	97 private static final byte[] CONTENT_LENGTH_0 = StringUtil.getBytes("Content-Length: 0\015\012");
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	98 private static final byte[] CONNECTION_KEEP_ALIVE = StringUtil.getBytes("Connection: keep-alive\015\012");
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	99 private static final byte[] CONNECTION_CLOSE = StringUtil.getBytes("Connection: close\015\012");
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	100 private static final byte[] CONNECTION_ = StringUtil.getBytes("Connection: ");
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	101 private static final byte[] CRLF = StringUtil.getBytes("\015\012");
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	102 private static final byte[] TRANSFER_ENCODING_CHUNKED = StringUtil.getBytes("Transfer-Encoding: chunked\015\012");
884 cb78ee27b0e0 remove Server.getVersion() Franklin Schmidt <fschmidt@gmail.com> parents: 877 diff changeset	103 private static byte[] SERVER = StringUtil.getBytes("Server: Jetty("+Server.version+")\015\012");
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	104
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	105 // other statics
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	106 private static final int CHUNK_SPACE = 12;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	107
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	108 // data
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	109 protected boolean _bypass = false; // True if _content buffer can be written directly to endp and bypass the content buffer
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	110 private boolean _needCRLF = false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	111 private boolean _needEOC = false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	112 private boolean _bufferChunked = false;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	113
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	114
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	115 /* ------------------------------------------------------------------------------- */
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	116 /**
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	117 * Constructor.
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	118 *
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	119 * @param buffers buffer pool
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	120 * @param io the end point to use
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	121 */
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	122 public HttpGenerator(Buffers buffers, EndPoint io)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	123 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	124 super(buffers,io);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	125 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	126
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	127 /* ------------------------------------------------------------------------------- */
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	128 @Override
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	129 public void reset()
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	130 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	131 if (_persistent!=null && !_persistent && _endp!=null && !_endp.isOutputShutdown())
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	132 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	133 try
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	134 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	135 _endp.shutdownOutput();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	136 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	137 catch(IOException e)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	138 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	139 LOG.trace("",e);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	140 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	141 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	142 super.reset();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	143 if (_buffer!=null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	144 _buffer.clear();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	145 if (_header!=null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	146 _header.clear();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	147 if (_content!=null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	148 _content=null;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	149 _bypass = false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	150 _needCRLF = false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	151 _needEOC = false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	152 _bufferChunked=false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	153 _method=null;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	154 _uri=null;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	155 _noContent=false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	156 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	157
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	158 /* ------------------------------------------------------------ */
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	159 /**
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	160 * Add content.
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	161 *
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	162 * @param content
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	163 * @param last
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	164 * @throws IllegalArgumentException if <code>content</code> is {@link Buffer#isImmutable immutable}.
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	165 * @throws IllegalStateException If the request is not expecting any more content,
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	166 * or if the buffers are full and cannot be flushed.
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	167 * @throws IOException if there is a problem flushing the buffers.
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	168 */
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	169 public void addContent(Buffer content, boolean last) throws IOException
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	170 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	171 if (_noContent)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	172 throw new IllegalStateException("NO CONTENT");
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	173
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	174 if (_last \|\| _state==STATE_END)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	175 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	176 LOG.warn("Ignoring extra content {}",content);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	177 content.clear();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	178 return;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	179 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	180 _last = last;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	181
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	182 // Handle any unfinished business?
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	183 if (_content!=null && _content.length()>0 \|\| _bufferChunked)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	184 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	185 if (_endp.isOutputShutdown())
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	186 throw new EofException();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	187 flushBuffer();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	188 if (_content != null && _content.length()>0)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	189 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	190 if (_bufferChunked)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	191 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	192 Buffer nc=_buffers.getBuffer(_content.length()+CHUNK_SPACE+content.length());
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	193 nc.put(_content);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	194 nc.put(HttpTokens.CRLF);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	195 BufferUtil.putHexInt(nc, content.length());
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	196 nc.put(HttpTokens.CRLF);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	197 nc.put(content);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	198 content=nc;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	199 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	200 else
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	201 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	202 Buffer nc=_buffers.getBuffer(_content.length()+content.length());
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	203 nc.put(_content);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	204 nc.put(content);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	205 content=nc;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	206 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	207 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	208 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	209
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	210 _content = content;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	211 _contentWritten += content.length();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	212
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	213 // Handle the _content
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	214 if (_head)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	215 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	216 content.clear();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	217 _content=null;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	218 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	219 else if (_endp != null && (_buffer==null \|\| _buffer.length()==0) && _content.length() > 0 && (_last \|\| isCommitted() && _content.length()>1024))
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	220 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	221 _bypass = true;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	222 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	223 else if (!_bufferChunked)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	224 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	225 // Yes - so we better check we have a buffer
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	226 if (_buffer == null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	227 _buffer = _buffers.getBuffer();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	228
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	229 // Copy _content to buffer;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	230 int len=_buffer.put(_content);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	231 _content.skip(len);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	232 if (_content.length() == 0)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	233 _content = null;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	234 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	235 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	236
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	237 /* ------------------------------------------------------------ */
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	238 /**
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	239 * send complete response.
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	240 *
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	241 * @param response
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	242 */
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	243 public void sendResponse(Buffer response) throws IOException
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	244 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	245 if (_noContent \|\| _state!=STATE_HEADER \|\| _content!=null && _content.length()>0 \|\| _bufferChunked \|\| _head )
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	246 throw new IllegalStateException();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	247
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	248 _last = true;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	249
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	250 _content = response;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	251 _bypass = true;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	252 _state = STATE_FLUSHING;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	253
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	254 // TODO this is not exactly right, but should do.
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	255 _contentLength =_contentWritten = response.length();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	256
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	257 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	258
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	259 /* ------------------------------------------------------------ */
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	260 /** Prepare buffer for unchecked writes.
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	261 * Prepare the generator buffer to receive unchecked writes
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	262 * @return the available space in the buffer.
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	263 * @throws IOException
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	264 */
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	265 @Override
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	266 public int prepareUncheckedAddContent() throws IOException
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	267 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	268 if (_noContent)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	269 return -1;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	270
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	271 if (_last \|\| _state==STATE_END)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	272 return -1;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	273
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	274 // Handle any unfinished business?
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	275 Buffer content = _content;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	276 if (content != null && content.length()>0 \|\| _bufferChunked)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	277 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	278 flushBuffer();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	279 if (content != null && content.length()>0 \|\| _bufferChunked)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	280 throw new IllegalStateException("FULL");
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	281 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	282
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	283 // we better check we have a buffer
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	284 if (_buffer == null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	285 _buffer = _buffers.getBuffer();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	286
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	287 _contentWritten-=_buffer.length();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	288
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	289 // Handle the _content
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	290 if (_head)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	291 return Integer.MAX_VALUE;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	292
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	293 return _buffer.space()-(_contentLength == HttpTokens.CHUNKED_CONTENT?CHUNK_SPACE:0);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	294 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	295
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	296 /* ------------------------------------------------------------ */
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	297 @Override
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	298 public boolean isBufferFull()
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	299 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	300 // Should we flush the buffers?
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	301 return super.isBufferFull() \|\| _bufferChunked \|\| _bypass \|\| (_contentLength == HttpTokens.CHUNKED_CONTENT && _buffer != null && _buffer.space() < CHUNK_SPACE);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	302 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	303
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	304 /* ------------------------------------------------------------ */
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	305 public void send1xx(int code) throws IOException
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	306 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	307 if (_state != STATE_HEADER)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	308 return;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	309
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	310 if (code<100\|\|code>199)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	311 throw new IllegalArgumentException("!1xx");
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	312 Status status=__status[code];
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	313 if (status==null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	314 throw new IllegalArgumentException(code+"?");
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	315
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	316 // get a header buffer
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	317 if (_header == null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	318 _header = _buffers.getHeader();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	319
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	320 _header.put(status._responseLine);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	321 _header.put(HttpTokens.CRLF);
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	322
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	323 try
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	324 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	325 // nasty semi busy flush!
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	326 while(_header.length()>0)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	327 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	328 int len = _endp.flush(_header);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	329 if (len<0)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	330 throw new EofException();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	331 if (len==0)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	332 Thread.sleep(100);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	333 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	334 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	335 catch(InterruptedException e)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	336 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	337 LOG.debug("",e);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	338 throw new InterruptedIOException(e.toString());
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	339 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	340 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	341
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	342 /* ------------------------------------------------------------ */
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	343 @Override
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	344 public boolean isRequest()
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	345 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	346 return _method!=null;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	347 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	348
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	349 /* ------------------------------------------------------------ */
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	350 @Override
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	351 public boolean isResponse()
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	352 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	353 return _method==null;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	354 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	355
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	356 /* ------------------------------------------------------------ */
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	357 @Override
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	358 public void completeHeader(HttpFields fields, boolean allContentAdded) throws IOException
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	359 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	360 if (_state != STATE_HEADER)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	361 return;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	362
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	363 // handle a reset
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	364 if (isResponse() && _status==0)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	365 throw new EofException();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	366
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	367 if (_last && !allContentAdded)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	368 throw new IllegalStateException("last?");
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	369 _last = _last \| allContentAdded;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	370
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	371 // get a header buffer
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	372 if (_header == null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	373 _header = _buffers.getHeader();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	374
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	375 boolean has_server = false;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	376
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	377 try
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	378 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	379 if (isRequest())
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	380 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	381 _persistent=true;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	382
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	383 if (_version == HttpVersions.HTTP_0_9_ORDINAL)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	384 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	385 _contentLength = HttpTokens.NO_CONTENT;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	386 _header.put(_method);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	387 _header.put((byte)' ');
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	388 _header.put(_uri.getBytes("UTF-8")); // TODO check
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	389 _header.put(HttpTokens.CRLF);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	390 _state = STATE_FLUSHING;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	391 _noContent=true;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	392 return;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	393 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	394 else
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	395 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	396 _header.put(_method);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	397 _header.put((byte)' ');
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	398 _header.put(_uri.getBytes("UTF-8")); // TODO check
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	399 _header.put((byte)' ');
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	400 _header.put(_version==HttpVersions.HTTP_1_0_ORDINAL?HttpVersions.HTTP_1_0_BUFFER:HttpVersions.HTTP_1_1_BUFFER);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	401 _header.put(HttpTokens.CRLF);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	402 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	403 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	404 else
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	405 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	406 // Responses
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	407 if (_version == HttpVersions.HTTP_0_9_ORDINAL)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	408 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	409 _persistent = false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	410 _contentLength = HttpTokens.EOF_CONTENT;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	411 _state = STATE_CONTENT;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	412 return;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	413 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	414 else
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	415 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	416 if (_persistent==null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	417 _persistent= (_version > HttpVersions.HTTP_1_0_ORDINAL);
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	418
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	419 // add response line
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	420 Status status = _status<__status.length?__status[_status]:null;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	421
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	422 if (status==null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	423 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	424 _header.put(HttpVersions.HTTP_1_1_BUFFER);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	425 _header.put((byte) ' ');
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	426 _header.put((byte) ('0' + _status / 100));
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	427 _header.put((byte) ('0' + (_status % 100) / 10));
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	428 _header.put((byte) ('0' + (_status % 10)));
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	429 _header.put((byte) ' ');
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	430 if (_reason==null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	431 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	432 _header.put((byte) ('0' + _status / 100));
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	433 _header.put((byte) ('0' + (_status % 100) / 10));
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	434 _header.put((byte) ('0' + (_status % 10)));
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	435 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	436 else
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	437 _header.put(_reason);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	438 _header.put(HttpTokens.CRLF);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	439 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	440 else
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	441 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	442 if (_reason==null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	443 _header.put(status._responseLine);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	444 else
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	445 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	446 _header.put(status._schemeCode);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	447 _header.put(_reason);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	448 _header.put(HttpTokens.CRLF);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	449 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	450 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	451
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	452 if (_status<200 && _status>=100 )
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	453 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	454 _noContent=true;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	455 _content=null;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	456 if (_buffer!=null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	457 _buffer.clear();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	458 // end the header.
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	459
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	460 if (_status!=101 )
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	461 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	462 _header.put(HttpTokens.CRLF);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	463 _state = STATE_CONTENT;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	464 return;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	465 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	466 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	467 else if (_status==204 \|\| _status==304)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	468 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	469 _noContent=true;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	470 _content=null;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	471 if (_buffer!=null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	472 _buffer.clear();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	473 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	474 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	475 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	476
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	477 // Add headers
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	478 if (_status>=200 && _date!=null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	479 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	480 _header.put(HttpHeaders.DATE_BUFFER);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	481 _header.put((byte)':');
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	482 _header.put((byte)' ');
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	483 _header.put(_date);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	484 _header.put(CRLF);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	485 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	486
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	487 // key field values
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	488 HttpFields.Field content_length = null;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	489 HttpFields.Field transfer_encoding = null;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	490 boolean keep_alive = false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	491 boolean close=false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	492 boolean content_type=false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	493 StringBuilder connection = null;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	494
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	495 if (fields != null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	496 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	497 int s=fields.size();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	498 for (int f=0;f<s;f++)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	499 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	500 HttpFields.Field field = fields.getField(f);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	501 if (field==null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	502 continue;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	503
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	504 switch (field.getNameOrdinal())
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	505 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	506 case HttpHeaders.CONTENT_LENGTH_ORDINAL:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	507 content_length = field;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	508 _contentLength = field.getLongValue();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	509
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	510 if (_contentLength < _contentWritten \|\| _last && _contentLength != _contentWritten)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	511 content_length = null;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	512
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	513 // write the field to the header buffer
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	514 field.putTo(_header);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	515 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	516
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	517 case HttpHeaders.CONTENT_TYPE_ORDINAL:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	518 if (BufferUtil.isPrefix(MimeTypes.MULTIPART_BYTERANGES_BUFFER, field.getValueBuffer())) _contentLength = HttpTokens.SELF_DEFINING_CONTENT;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	519
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	520 // write the field to the header buffer
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	521 content_type=true;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	522 field.putTo(_header);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	523 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	524
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	525 case HttpHeaders.TRANSFER_ENCODING_ORDINAL:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	526 if (_version == HttpVersions.HTTP_1_1_ORDINAL)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	527 transfer_encoding = field;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	528 // Do NOT add yet!
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	529 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	530
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	531 case HttpHeaders.CONNECTION_ORDINAL:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	532 if (isRequest())
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	533 field.putTo(_header);
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	534
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	535 int connection_value = field.getValueOrdinal();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	536 switch (connection_value)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	537 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	538 case -1:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	539 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	540 String[] values = field.getValue().split(",");
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	541 for (int i=0;values!=null && i<values.length;i++)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	542 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	543 CachedBuffer cb = HttpHeaderValues.CACHE.get(values[i].trim());
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	544
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	545 if (cb!=null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	546 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	547 switch(cb.getOrdinal())
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	548 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	549 case HttpHeaderValues.CLOSE_ORDINAL:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	550 close=true;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	551 if (isResponse())
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	552 _persistent=false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	553 keep_alive=false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	554 if (!_persistent && isResponse() && _contentLength == HttpTokens.UNKNOWN_CONTENT)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	555 _contentLength = HttpTokens.EOF_CONTENT;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	556 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	557
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	558 case HttpHeaderValues.KEEP_ALIVE_ORDINAL:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	559 if (_version == HttpVersions.HTTP_1_0_ORDINAL)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	560 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	561 keep_alive = true;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	562 if (isResponse())
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	563 _persistent = true;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	564 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	565 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	566
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	567 default:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	568 if (connection==null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	569 connection=new StringBuilder();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	570 else
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	571 connection.append(',');
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	572 connection.append(values[i]);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	573 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	574 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	575 else
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	576 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	577 if (connection==null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	578 connection=new StringBuilder();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	579 else
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	580 connection.append(',');
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	581 connection.append(values[i]);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	582 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	583 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	584
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	585 break;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	586 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	587 case HttpHeaderValues.UPGRADE_ORDINAL:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	588 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	589 // special case for websocket connection ordering
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	590 if (isResponse())
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	591 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	592 field.putTo(_header);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	593 continue;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	594 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	595 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	596 case HttpHeaderValues.CLOSE_ORDINAL:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	597 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	598 close=true;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	599 if (isResponse())
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	600 _persistent=false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	601 if (!_persistent && isResponse() && _contentLength == HttpTokens.UNKNOWN_CONTENT)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	602 _contentLength = HttpTokens.EOF_CONTENT;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	603 break;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	604 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	605 case HttpHeaderValues.KEEP_ALIVE_ORDINAL:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	606 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	607 if (_version == HttpVersions.HTTP_1_0_ORDINAL)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	608 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	609 keep_alive = true;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	610 if (isResponse())
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	611 _persistent=true;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	612 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	613 break;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	614 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	615 default:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	616 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	617 if (connection==null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	618 connection=new StringBuilder();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	619 else
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	620 connection.append(',');
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	621 connection.append(field.getValue());
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	622 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	623 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	624
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	625 // Do NOT add yet!
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	626 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	627
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	628 case HttpHeaders.SERVER_ORDINAL:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	629 has_server=true;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	630 field.putTo(_header);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	631 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	632
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	633 default:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	634 // write the field to the header buffer
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	635 field.putTo(_header);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	636 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	637 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	638 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	639
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	640 // Calculate how to end _content and connection, _content length and transfer encoding
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	641 // settings.
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	642 // From RFC 2616 4.4:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	643 // 1. No body for 1xx, 204, 304 & HEAD response
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	644 // 2. Force _content-length?
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	645 // 3. If Transfer-Encoding!=identity && HTTP/1.1 && !HttpConnection==close then chunk
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	646 // 4. Content-Length
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	647 // 5. multipart/byteranges
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	648 // 6. close
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	649 switch ((int) _contentLength)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	650 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	651 case HttpTokens.UNKNOWN_CONTENT:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	652 // It may be that we have no _content, or perhaps _content just has not been
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	653 // written yet?
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	654
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	655 // Response known not to have a body
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	656 if (_contentWritten == 0 && isResponse() && (_status < 200 \|\| _status == 204 \|\| _status == 304))
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	657 _contentLength = HttpTokens.NO_CONTENT;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	658 else if (_last)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	659 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	660 // we have seen all the _content there is
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	661 _contentLength = _contentWritten;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	662 if (content_length == null && (isResponse() \|\| _contentLength>0 \|\| content_type ) && !_noContent)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	663 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	664 // known length but not actually set.
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	665 _header.put(HttpHeaders.CONTENT_LENGTH_BUFFER);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	666 _header.put(HttpTokens.COLON);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	667 _header.put((byte) ' ');
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	668 BufferUtil.putDecLong(_header, _contentLength);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	669 _header.put(HttpTokens.CRLF);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	670 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	671 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	672 else
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	673 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	674 // No idea, so we must assume that a body is coming
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	675 _contentLength = (!_persistent \|\| _version < HttpVersions.HTTP_1_1_ORDINAL ) ? HttpTokens.EOF_CONTENT : HttpTokens.CHUNKED_CONTENT;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	676 if (isRequest() && _contentLength==HttpTokens.EOF_CONTENT)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	677 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	678 _contentLength=HttpTokens.NO_CONTENT;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	679 _noContent=true;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	680 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	681 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	682 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	683
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	684 case HttpTokens.NO_CONTENT:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	685 if (content_length == null && isResponse() && _status >= 200 && _status != 204 && _status != 304)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	686 _header.put(CONTENT_LENGTH_0);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	687 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	688
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	689 case HttpTokens.EOF_CONTENT:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	690 _persistent = isRequest();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	691 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	692
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	693 case HttpTokens.CHUNKED_CONTENT:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	694 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	695
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	696 default:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	697 // TODO - maybe allow forced chunking by setting te ???
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	698 break;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	699 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	700
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	701 // Add transfer_encoding if needed
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	702 if (_contentLength == HttpTokens.CHUNKED_CONTENT)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	703 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	704 // try to use user supplied encoding as it may have other values.
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	705 if (transfer_encoding != null && HttpHeaderValues.CHUNKED_ORDINAL != transfer_encoding.getValueOrdinal())
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	706 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	707 String c = transfer_encoding.getValue();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	708 if (c.endsWith(HttpHeaderValues.CHUNKED))
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	709 transfer_encoding.putTo(_header);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	710 else
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	711 throw new IllegalArgumentException("BAD TE");
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	712 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	713 else
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	714 _header.put(TRANSFER_ENCODING_CHUNKED);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	715 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	716
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	717 // Handle connection if need be
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	718 if (_contentLength==HttpTokens.EOF_CONTENT)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	719 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	720 keep_alive=false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	721 _persistent=false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	722 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	723
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	724 if (isResponse())
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	725 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	726 if (!_persistent && (close \|\| _version > HttpVersions.HTTP_1_0_ORDINAL))
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	727 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	728 _header.put(CONNECTION_CLOSE);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	729 if (connection!=null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	730 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	731 _header.setPutIndex(_header.putIndex()-2);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	732 _header.put((byte)',');
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	733 _header.put(connection.toString().getBytes());
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	734 _header.put(CRLF);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	735 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	736 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	737 else if (keep_alive)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	738 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	739 _header.put(CONNECTION_KEEP_ALIVE);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	740 if (connection!=null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	741 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	742 _header.setPutIndex(_header.putIndex()-2);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	743 _header.put((byte)',');
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	744 _header.put(connection.toString().getBytes());
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	745 _header.put(CRLF);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	746 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	747 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	748 else if (connection!=null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	749 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	750 _header.put(CONNECTION_);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	751 _header.put(connection.toString().getBytes());
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	752 _header.put(CRLF);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	753 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	754 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	755
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	756 if (!has_server && _status>199)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	757 _header.put(SERVER);
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	758
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	759 // end the header.
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	760 _header.put(HttpTokens.CRLF);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	761 _state = STATE_CONTENT;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	762
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	763 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	764 catch(ArrayIndexOutOfBoundsException e)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	765 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	766 throw new RuntimeException("Header>"+_header.capacity(),e);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	767 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	768 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	769
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	770 /* ------------------------------------------------------------ */
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	771 /**
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	772 * Complete the message.
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	773 *
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	774 * @throws IOException
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	775 */
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	776 @Override
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	777 public void complete() throws IOException
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	778 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	779 if (_state == STATE_END)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	780 return;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	781
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	782 super.complete();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	783
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	784 if (_state < STATE_FLUSHING)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	785 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	786 _state = STATE_FLUSHING;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	787 if (_contentLength == HttpTokens.CHUNKED_CONTENT)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	788 _needEOC = true;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	789 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	790
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	791 flushBuffer();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	792 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	793
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	794 /* ------------------------------------------------------------ */
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	795 @Override
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	796 public int flushBuffer() throws IOException
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	797 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	798 try
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	799 {
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	800
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	801 if (_state == STATE_HEADER)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	802 throw new IllegalStateException("State==HEADER");
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	803
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	804 prepareBuffers();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	805
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	806 if (_endp == null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	807 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	808 if (_needCRLF && _buffer!=null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	809 _buffer.put(HttpTokens.CRLF);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	810 if (_needEOC && _buffer!=null && !_head)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	811 _buffer.put(LAST_CHUNK);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	812 _needCRLF=false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	813 _needEOC=false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	814 return 0;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	815 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	816
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	817 int total= 0;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	818
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	819 int len = -1;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	820 int to_flush = flushMask();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	821 int last_flush;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	822
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	823 do
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	824 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	825 last_flush=to_flush;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	826 switch (to_flush)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	827 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	828 case 7:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	829 throw new IllegalStateException(); // should never happen!
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	830 case 6:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	831 len = _endp.flush(_header, _buffer, null);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	832 break;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	833 case 5:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	834 len = _endp.flush(_header, _content, null);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	835 break;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	836 case 4:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	837 len = _endp.flush(_header);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	838 break;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	839 case 3:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	840 len = _endp.flush(_buffer, _content, null);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	841 break;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	842 case 2:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	843 len = _endp.flush(_buffer);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	844 break;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	845 case 1:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	846 len = _endp.flush(_content);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	847 break;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	848 case 0:
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	849 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	850 len=0;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	851 // Nothing more we can write now.
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	852 if (_header != null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	853 _header.clear();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	854
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	855 _bypass = false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	856 _bufferChunked = false;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	857
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	858 if (_buffer != null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	859 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	860 _buffer.clear();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	861 if (_contentLength == HttpTokens.CHUNKED_CONTENT)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	862 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	863 // reserve some space for the chunk header
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	864 _buffer.setPutIndex(CHUNK_SPACE);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	865 _buffer.setGetIndex(CHUNK_SPACE);
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	866
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	867 // Special case handling for small left over buffer from
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	868 // an addContent that caused a buffer flush.
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	869 if (_content != null && _content.length() < _buffer.space() && _state != STATE_FLUSHING)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	870 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	871 _buffer.put(_content);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	872 _content.clear();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	873 _content=null;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	874 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	875 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	876 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	877
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	878 // Are we completely finished for now?
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	879 if (!_needCRLF && !_needEOC && (_content==null \|\| _content.length()==0))
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	880 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	881 if (_state == STATE_FLUSHING)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	882 _state = STATE_END;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	883
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	884 if (_state==STATE_END && _persistent != null && !_persistent && _status!=100 && _method==null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	885 _endp.shutdownOutput();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	886 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	887 else
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	888 // Try to prepare more to write.
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	889 prepareBuffers();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	890 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	891
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	892 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	893
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	894 if (len > 0)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	895 total+=len;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	896
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	897 to_flush = flushMask();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	898 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	899 // loop while progress is being made (OR we have prepared some buffers that might make progress)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	900 while (len>0 \|\| (to_flush!=0 && last_flush==0));
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	901
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	902 return total;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	903 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	904 catch (IOException e)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	905 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	906 LOG.trace("",e);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	907 throw (e instanceof EofException) ? e:new EofException(e);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	908 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	909 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	910
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	911 /* ------------------------------------------------------------ */
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	912 private int flushMask()
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	913 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	914 return ((_header != null && _header.length() > 0)?4:0)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	915 \| ((_buffer != null && _buffer.length() > 0)?2:0)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	916 \| ((_bypass && _content != null && _content.length() > 0)?1:0);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	917 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	918
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	919 /* ------------------------------------------------------------ */
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	920 private void prepareBuffers()
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	921 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	922 // if we are not flushing an existing chunk
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	923 if (!_bufferChunked)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	924 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	925 // Refill buffer if possible
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	926 if (!_bypass && _content != null && _content.length() > 0 && _buffer != null && _buffer.space() > 0)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	927 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	928 int len = _buffer.put(_content);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	929 _content.skip(len);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	930 if (_content.length() == 0)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	931 _content = null;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	932 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	933
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	934 // Chunk buffer if need be
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	935 if (_contentLength == HttpTokens.CHUNKED_CONTENT)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	936 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	937 if (_bypass && (_buffer==null\|\|_buffer.length()==0) && _content!=null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	938 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	939 // this is a bypass write
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	940 int size = _content.length();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	941 _bufferChunked = true;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	942
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	943 if (_header == null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	944 _header = _buffers.getHeader();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	945
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	946 // if we need CRLF add this to header
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	947 if (_needCRLF)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	948 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	949 if (_header.length() > 0) throw new IllegalStateException("EOC");
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	950 _header.put(HttpTokens.CRLF);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	951 _needCRLF = false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	952 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	953 // Add the chunk size to the header
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	954 BufferUtil.putHexInt(_header, size);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	955 _header.put(HttpTokens.CRLF);
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	956
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	957 // Need a CRLF after the content
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	958 _needCRLF=true;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	959 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	960 else if (_buffer!=null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	961 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	962 int size = _buffer.length();
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	963 if (size > 0)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	964 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	965 // Prepare a chunk!
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	966 _bufferChunked = true;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	967
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	968 // Did we leave space at the start of the buffer.
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	969 //noinspection ConstantConditions
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	970 if (_buffer.getIndex() == CHUNK_SPACE)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	971 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	972 // Oh yes, goodie! let's use it then!
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	973 _buffer.poke(_buffer.getIndex() - 2, HttpTokens.CRLF, 0, 2);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	974 _buffer.setGetIndex(_buffer.getIndex() - 2);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	975 BufferUtil.prependHexInt(_buffer, size);
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	976
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	977 if (_needCRLF)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	978 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	979 _buffer.poke(_buffer.getIndex() - 2, HttpTokens.CRLF, 0, 2);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	980 _buffer.setGetIndex(_buffer.getIndex() - 2);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	981 _needCRLF = false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	982 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	983 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	984 else
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	985 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	986 // No space so lets use a header buffer.
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	987 if (_header == null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	988 _header = _buffers.getHeader();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	989
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	990 if (_needCRLF)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	991 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	992 if (_header.length() > 0) throw new IllegalStateException("EOC");
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	993 _header.put(HttpTokens.CRLF);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	994 _needCRLF = false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	995 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	996 BufferUtil.putHexInt(_header, size);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	997 _header.put(HttpTokens.CRLF);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	998 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	999
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1000 // Add end chunk trailer.
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1001 if (_buffer.space() >= 2)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1002 _buffer.put(HttpTokens.CRLF);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1003 else
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1004 _needCRLF = true;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1005 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1006 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1007
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1008 // If we need EOC and everything written
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1009 if (_needEOC && (_content == null \|\| _content.length() == 0))
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1010 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1011 if (_header == null && _buffer == null)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1012 _header = _buffers.getHeader();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1013
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1014 if (_needCRLF)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1015 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1016 if (_buffer == null && _header != null && _header.space() >= HttpTokens.CRLF.length)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1017 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1018 _header.put(HttpTokens.CRLF);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1019 _needCRLF = false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1020 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1021 else if (_buffer!=null && _buffer.space() >= HttpTokens.CRLF.length)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1022 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1023 _buffer.put(HttpTokens.CRLF);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1024 _needCRLF = false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1025 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1026 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1027
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1028 if (!_needCRLF && _needEOC)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1029 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1030 if (_buffer == null && _header != null && _header.space() >= LAST_CHUNK.length)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1031 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1032 if (!_head)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1033 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1034 _header.put(LAST_CHUNK);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1035 _bufferChunked=true;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1036 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1037 _needEOC = false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1038 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1039 else if (_buffer!=null && _buffer.space() >= LAST_CHUNK.length)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1040 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1041 if (!_head)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1042 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1043 _buffer.put(LAST_CHUNK);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1044 _bufferChunked=true;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1045 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1046 _needEOC = false;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1047 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1048 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1049 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1050 }
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1051 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1052
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1053 if (_content != null && _content.length() == 0)
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1054 _content = null;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1055
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1056 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1057
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1058 public int getBytesBuffered()
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1059 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1060 return(_header==null?0:_header.length())+
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1061 (_buffer==null?0:_buffer.length())+
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1062 (_content==null?0:_content.length());
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1063 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1064
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1065 public boolean isEmpty()
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1066 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1067 return (_header==null\|\|_header.length()==0) &&
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1068 (_buffer==null\|\|_buffer.length()==0) &&
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1069 (_content==null\|\|_content.length()==0);
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1070 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1071
877 fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1072 @Override
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1073 public String toString()
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1074 {
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1075 Buffer header=_header;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1076 Buffer buffer=_buffer;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1077 Buffer content=_content;
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1078 return String.format("%s{s=%d,h=%d,b=%d,c=%d}",
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1079 getClass().getSimpleName(),
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1080 _state,
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1081 header == null ? -1 : header.length(),
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1082 buffer == null ? -1 : buffer.length(),
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1083 content == null ? -1 : content.length());
fef4392f4905 remove sendServerVersion Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1084 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1085 }

Mercurial Hosting > luan

annotate src/org/eclipse/jetty/http/HttpGenerator.java @ 965:866f2e801618