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

annotate src/org/eclipse/jetty/http/HttpParser.java @ 980:bd26bd9320e2

simplify HttpParser

author	Franklin Schmidt <fschmidt@gmail.com>
date	Sun, 16 Oct 2016 21:01:26 -0600
parents	c8cd3e96db5f
children	39154cfa58e4

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
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	23 import org.eclipse.jetty.io.Buffer;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	24 import org.eclipse.jetty.io.BufferCache.CachedBuffer;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	25 import org.eclipse.jetty.io.BufferUtil;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	26 import org.eclipse.jetty.io.Buffers;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	27 import org.eclipse.jetty.io.ByteArrayBuffer;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	28 import org.eclipse.jetty.io.EndPoint;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	29 import org.eclipse.jetty.io.EofException;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	30 import org.eclipse.jetty.io.View;
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	31 import org.eclipse.jetty.util.StringUtil;
820 8e9db0bbf4f9 remove org.eclipse.jetty.util.log and upgrade slf4j Franklin Schmidt <fschmidt@gmail.com> parents: 802 diff changeset	32 import org.slf4j.Logger;
8e9db0bbf4f9 remove org.eclipse.jetty.util.log and upgrade slf4j Franklin Schmidt <fschmidt@gmail.com> parents: 802 diff changeset	33 import org.slf4j.LoggerFactory;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	34
979 c8cd3e96db5f remove Parser Franklin Schmidt <fschmidt@gmail.com> parents: 873 diff changeset	35 public final class HttpParser
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	36 {
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	37 private static final Logger LOG = LoggerFactory.getLogger(HttpParser.class);
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	38
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	39 // States
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	40 private static final int STATE_START=-14;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	41 private static final int STATE_FIELD0=-13;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	42 private static final int STATE_SPACE1=-12;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	43 private static final int STATE_STATUS=-11;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	44 private static final int STATE_URI=-10;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	45 private static final int STATE_SPACE2=-9;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	46 private static final int STATE_END0=-8;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	47 private static final int STATE_END1=-7;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	48 private static final int STATE_FIELD2=-6;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	49 private static final int STATE_HEADER=-5;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	50 private static final int STATE_HEADER_NAME=-4;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	51 private static final int STATE_HEADER_IN_NAME=-3;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	52 private static final int STATE_HEADER_VALUE=-2;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	53 private static final int STATE_HEADER_IN_VALUE=-1;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	54 private static final int STATE_END=0;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	55 private static final int STATE_EOF_CONTENT=1;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	56 private static final int STATE_CONTENT=2;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	57 private static final int STATE_CHUNKED_CONTENT=3;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	58 private static final int STATE_CHUNK_SIZE=4;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	59 private static final int STATE_CHUNK_PARAMS=5;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	60 private static final int STATE_CHUNK=6;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	61 private static final int STATE_SEEKING_EOF=7;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	62
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	63 private final EventHandler _handler;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	64 private final Buffers _buffers; // source of buffers
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	65 private final EndPoint _endp;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	66 private Buffer _header; // Buffer for header data (and small _content)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	67 private Buffer _body; // Buffer for large content
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	68 private Buffer _buffer; // The current buffer in use (either _header or _content)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	69 private CachedBuffer _cached;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	70 private final View.CaseInsensitive _tok0; // Saved token: header name, request method or response version
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	71 private final View.CaseInsensitive _tok1; // Saved token: header value, request URI or response code
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	72 private String _multiLineValue;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	73 private int _responseStatus; // If >0 then we are parsing a response
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	74 private boolean _persistent;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	75
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	76 protected final View _contentView = new View(); // View of the content in the buffer for {@link Input}
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	77 protected int _state = STATE_START;
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	78 protected byte _eol;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	79 protected int _length;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	80 protected long _contentLength;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	81 protected long _contentPosition;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	82 protected int _chunkLength;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	83 protected int _chunkPosition;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	84 private boolean _headResponse;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	85
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	86 public HttpParser(Buffers buffers, EndPoint endp, EventHandler handler)
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	87 {
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	88 _buffers = buffers;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	89 _endp = endp;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	90 _handler = handler;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	91 _tok0 = new View.CaseInsensitive();
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	92 _tok1 = new View.CaseInsensitive();
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	93 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	94
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	95 public long getContentLength()
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	96 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	97 return _contentLength;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	98 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	99
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	100 public long getContentRead()
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	101 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	102 return _contentPosition;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	103 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	104
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	105 /* ------------------------------------------------------------ */
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	106 /** Set if a HEAD response is expected
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	107 * @param head
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	108 */
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	109 public void setHeadResponse(boolean head)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	110 {
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	111 _headResponse = head;
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	112 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	113
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	114 public boolean isChunking()
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	115 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	116 return _contentLength==HttpTokens.CHUNKED_CONTENT;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	117 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	118
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	119 public boolean isIdle()
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	120 {
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	121 return _state==STATE_START;
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	122 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	123
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	124 public boolean isComplete()
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	125 {
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	126 return _state==STATE_END;
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	127 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	128
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	129 public boolean isPersistent()
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	130 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	131 return _persistent;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	132 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	133
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	134 public void setPersistent(boolean persistent)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	135 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	136 _persistent = persistent;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	137 if (!_persistent &&(_state==STATE_END \|\| _state==STATE_START))
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	138 _state=STATE_SEEKING_EOF;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	139 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	140
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	141 /* ------------------------------------------------------------------------------- */
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	142 /**
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	143 * Parse until END state.
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	144 * This method will parse any remaining content in the current buffer as long as there is
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	145 * no unconsumed content. It does not care about the {@link #getState current state} of the parser.
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	146 * @see #parse
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	147 * @see #parseNext
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	148 */
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	149 public boolean parseAvailable() throws IOException
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	150 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	151 boolean progress=parseNext()>0;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	152
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	153 // continue parsing
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	154 while (!isComplete() && _buffer!=null && _buffer.length()>0 && !_contentView.hasContent())
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	155 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	156 progress \|= parseNext()>0;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	157 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	158 return progress;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	159 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	160
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	161
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	162 /* ------------------------------------------------------------------------------- */
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	163 /**
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	164 * Parse until next Event.
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	165 * @return an indication of progress <0 EOF, 0 no progress, >0 progress.
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	166 */
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	167 private int parseNext() throws IOException
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	168 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	169 try
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	170 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	171 int progress=0;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	172
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	173 if (_state == STATE_END)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	174 return 0;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	175
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	176 if (_buffer==null)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	177 _buffer=getHeaderBuffer();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	178
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	179
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	180 if (_state == STATE_CONTENT && _contentPosition == _contentLength)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	181 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	182 _state=STATE_END;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	183 _handler.messageComplete(_contentPosition);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	184 return 1;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	185 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	186
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	187 int length=_buffer.length();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	188
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	189 // Fill buffer if we can
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	190 if (length == 0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	191 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	192 int filled=-1;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	193 IOException ex=null;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	194 try
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	195 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	196 filled=fill();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	197 LOG.debug("filled {}/{}",filled,_buffer.length());
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	198 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	199 catch(IOException e)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	200 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	201 LOG.debug(this.toString(),e);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	202 ex=e;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	203 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	204
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	205 if (filled > 0 )
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	206 progress++;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	207 else if (filled < 0 )
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	208 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	209 _persistent=false;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	210
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	211 // do we have content to deliver?
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	212 if (_state>STATE_END)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	213 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	214 if (_buffer.length()>0 && !_headResponse)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	215 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	216 Buffer chunk=_buffer.get(_buffer.length());
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	217 _contentPosition += chunk.length();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	218 _contentView.update(chunk);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	219 _handler.content(chunk); // May recurse here
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	220 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	221 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	222
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	223 // was this unexpected?
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	224 switch(_state)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	225 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	226 case STATE_END:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	227 case STATE_SEEKING_EOF:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	228 _state=STATE_END;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	229 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	230
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	231 case STATE_EOF_CONTENT:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	232 _state=STATE_END;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	233 _handler.messageComplete(_contentPosition);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	234 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	235
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	236 default:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	237 _state=STATE_END;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	238 if (!_headResponse)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	239 _handler.earlyEOF();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	240 _handler.messageComplete(_contentPosition);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	241 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	242
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	243 if (ex!=null)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	244 throw ex;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	245
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	246 if (!isComplete() && !isIdle())
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	247 throw new EofException();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	248
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	249 return -1;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	250 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	251 length=_buffer.length();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	252 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	253
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	254
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	255 // Handle header states
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	256 byte ch;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	257 byte[] array=_buffer.array();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	258 int last=_state;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	259 while (_state<STATE_END && length-->0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	260 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	261 if (last!=_state)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	262 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	263 progress++;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	264 last=_state;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	265 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	266
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	267 ch=_buffer.get();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	268
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	269 if (_eol == HttpTokens.CARRIAGE_RETURN)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	270 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	271 if (ch == HttpTokens.LINE_FEED)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	272 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	273 _eol=HttpTokens.LINE_FEED;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	274 continue;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	275 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	276 throw new HttpException(HttpStatus.BAD_REQUEST_400);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	277 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	278 _eol=0;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	279
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	280 switch (_state)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	281 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	282 case STATE_START:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	283 _contentLength=HttpTokens.UNKNOWN_CONTENT;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	284 _cached=null;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	285 if (ch > HttpTokens.SPACE \|\| ch<0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	286 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	287 _buffer.mark();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	288 _state=STATE_FIELD0;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	289 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	290 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	291
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	292 case STATE_FIELD0:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	293 if (ch == HttpTokens.SPACE)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	294 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	295 _tok0.update(_buffer.markIndex(), _buffer.getIndex() - 1);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	296 _responseStatus=HttpVersions.CACHE.get(_tok0)==null?-1:0;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	297 _state=STATE_SPACE1;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	298 continue;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	299 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	300 else if (ch < HttpTokens.SPACE && ch>=0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	301 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	302 throw new HttpException(HttpStatus.BAD_REQUEST_400);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	303 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	304 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	305
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	306 case STATE_SPACE1:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	307 if (ch > HttpTokens.SPACE \|\| ch<0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	308 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	309 _buffer.mark();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	310 if (_responseStatus>=0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	311 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	312 _state=STATE_STATUS;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	313 _responseStatus=ch-'0';
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	314 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	315 else
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	316 _state=STATE_URI;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	317 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	318 else if (ch < HttpTokens.SPACE)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	319 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	320 throw new HttpException(HttpStatus.BAD_REQUEST_400);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	321 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	322 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	323
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	324 case STATE_STATUS:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	325 if (ch == HttpTokens.SPACE)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	326 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	327 _tok1.update(_buffer.markIndex(), _buffer.getIndex() - 1);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	328 _state=STATE_SPACE2;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	329 continue;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	330 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	331 else if (ch>='0' && ch<='9')
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	332 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	333 _responseStatus=_responseStatus*10+(ch-'0');
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	334 continue;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	335 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	336 else if (ch < HttpTokens.SPACE && ch>=0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	337 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	338 _eol=ch;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	339 _state=STATE_HEADER;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	340 _tok0.setPutIndex(_tok0.getIndex());
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	341 _tok1.setPutIndex(_tok1.getIndex());
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	342 _multiLineValue=null;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	343 continue;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	344 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	345 // not a digit, so must be a URI
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	346 _state=STATE_URI;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	347 _responseStatus=-1;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	348 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	349
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	350 case STATE_URI:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	351 if (ch == HttpTokens.SPACE)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	352 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	353 _tok1.update(_buffer.markIndex(), _buffer.getIndex() - 1);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	354 _state=STATE_SPACE2;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	355 continue;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	356 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	357 else if (ch < HttpTokens.SPACE && ch>=0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	358 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	359 // HTTP/0.9
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	360 _handler.startRequest(HttpMethods.CACHE.lookup(_tok0), _buffer.sliceFromMark(), null);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	361 _persistent=false;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	362 _state=STATE_SEEKING_EOF;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	363 _handler.headerComplete();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	364 _handler.messageComplete(_contentPosition);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	365 return 1;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	366 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	367 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	368
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	369 case STATE_SPACE2:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	370 if (ch > HttpTokens.SPACE \|\| ch<0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	371 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	372 _buffer.mark();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	373 _state=STATE_FIELD2;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	374 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	375 else if (ch < HttpTokens.SPACE)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	376 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	377 if (_responseStatus>0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	378 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	379 _eol=ch;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	380 _state=STATE_HEADER;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	381 _tok0.setPutIndex(_tok0.getIndex());
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	382 _tok1.setPutIndex(_tok1.getIndex());
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	383 _multiLineValue=null;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	384 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	385 else
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	386 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	387 // HTTP/0.9
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	388 _handler.startRequest(HttpMethods.CACHE.lookup(_tok0), _tok1, null);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	389 _persistent=false;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	390 _state=STATE_SEEKING_EOF;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	391 _handler.headerComplete();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	392 _handler.messageComplete(_contentPosition);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	393 return 1;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	394 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	395 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	396 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	397
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	398 case STATE_FIELD2:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	399 if (ch == HttpTokens.CARRIAGE_RETURN \|\| ch == HttpTokens.LINE_FEED)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	400 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	401 Buffer version;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	402 if (_responseStatus>0)
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	403 // _handler.startResponse(version=HttpVersions.CACHE.lookup(_tok0), _responseStatus,_buffer.sliceFromMark());
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	404 version = HttpVersions.CACHE.lookup(_tok0);
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	405 else
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	406 _handler.startRequest(HttpMethods.CACHE.lookup(_tok0), _tok1, version=HttpVersions.CACHE.lookup(_buffer.sliceFromMark()));
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	407 _eol=ch;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	408 _persistent=HttpVersions.CACHE.getOrdinal(version)>=HttpVersions.HTTP_1_1_ORDINAL;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	409 _state=STATE_HEADER;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	410 _tok0.setPutIndex(_tok0.getIndex());
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	411 _tok1.setPutIndex(_tok1.getIndex());
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	412 _multiLineValue=null;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	413 continue;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	414 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	415 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	416
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	417 case STATE_HEADER:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	418 switch(ch)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	419 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	420 case HttpTokens.COLON:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	421 case HttpTokens.SPACE:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	422 case HttpTokens.TAB:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	423 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	424 // header value without name - continuation?
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	425 _length=-1;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	426 _state=STATE_HEADER_VALUE;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	427 break;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	428 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	429
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	430 default:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	431 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	432 // handler last header if any
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	433 if (_cached!=null \|\| _tok0.length() > 0 \|\| _tok1.length() > 0 \|\| _multiLineValue != null)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	434 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	435 Buffer header=_cached!=null?_cached:HttpHeaders.CACHE.lookup(_tok0);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	436 _cached=null;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	437 Buffer value=_multiLineValue == null ? _tok1 : new ByteArrayBuffer(_multiLineValue);
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	438
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	439 int ho=HttpHeaders.CACHE.getOrdinal(header);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	440 if (ho >= 0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	441 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	442 int vo;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	443
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	444 switch (ho)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	445 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	446 case HttpHeaders.CONTENT_LENGTH_ORDINAL:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	447 if (_contentLength != HttpTokens.CHUNKED_CONTENT )
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	448 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	449 try
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	450 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	451 _contentLength=BufferUtil.toLong(value);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	452 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	453 catch(NumberFormatException e)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	454 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	455 LOG.trace("",e);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	456 throw new HttpException(HttpStatus.BAD_REQUEST_400);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	457 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	458 if (_contentLength <= 0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	459 _contentLength=HttpTokens.NO_CONTENT;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	460 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	461 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	462
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	463 case HttpHeaders.TRANSFER_ENCODING_ORDINAL:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	464 value=HttpHeaderValues.CACHE.lookup(value);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	465 vo=HttpHeaderValues.CACHE.getOrdinal(value);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	466 if (HttpHeaderValues.CHUNKED_ORDINAL == vo)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	467 _contentLength=HttpTokens.CHUNKED_CONTENT;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	468 else
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	469 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	470 String c=value.toString(StringUtil.__ISO_8859_1);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	471 if (c.endsWith(HttpHeaderValues.CHUNKED))
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	472 _contentLength=HttpTokens.CHUNKED_CONTENT;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	473
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	474 else if (c.indexOf(HttpHeaderValues.CHUNKED) >= 0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	475 throw new HttpException(400,null);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	476 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	477 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	478
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	479 case HttpHeaders.CONNECTION_ORDINAL:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	480 switch(HttpHeaderValues.CACHE.getOrdinal(value))
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	481 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	482 case HttpHeaderValues.CLOSE_ORDINAL:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	483 _persistent=false;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	484 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	485
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	486 case HttpHeaderValues.KEEP_ALIVE_ORDINAL:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	487 _persistent=true;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	488 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	489
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	490 case -1: // No match, may be multi valued
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	491 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	492 for (String v : value.toString().split(","))
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	493 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	494 switch(HttpHeaderValues.CACHE.getOrdinal(v.trim()))
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	495 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	496 case HttpHeaderValues.CLOSE_ORDINAL:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	497 _persistent=false;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	498 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	499
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	500 case HttpHeaderValues.KEEP_ALIVE_ORDINAL:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	501 _persistent=true;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	502 break;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	503 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	504 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	505 break;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	506 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	507 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	508 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	509 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	510
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	511 _handler.parsedHeader(header, value);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	512 _tok0.setPutIndex(_tok0.getIndex());
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	513 _tok1.setPutIndex(_tok1.getIndex());
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	514 _multiLineValue=null;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	515 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	516 _buffer.setMarkIndex(-1);
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	517
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	518 // now handle ch
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	519 if (ch == HttpTokens.CARRIAGE_RETURN \|\| ch == HttpTokens.LINE_FEED)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	520 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	521 // is it a response that cannot have a body?
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	522 if (_responseStatus > 0 && // response
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	523 (_responseStatus == 304 \|\| // not-modified response
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	524 _responseStatus == 204 \|\| // no-content response
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	525 _responseStatus < 200)) // 1xx response
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	526 _contentLength=HttpTokens.NO_CONTENT; // ignore any other headers set
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	527 // else if we don't know framing
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	528 else if (_contentLength == HttpTokens.UNKNOWN_CONTENT)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	529 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	530 if (_responseStatus == 0 // request
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	531 \|\| _responseStatus == 304 // not-modified response
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	532 \|\| _responseStatus == 204 // no-content response
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	533 \|\| _responseStatus < 200) // 1xx response
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	534 _contentLength=HttpTokens.NO_CONTENT;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	535 else
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	536 _contentLength=HttpTokens.EOF_CONTENT;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	537 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	538
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	539 _contentPosition=0;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	540 _eol=ch;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	541 if (_eol==HttpTokens.CARRIAGE_RETURN && _buffer.hasContent() && _buffer.peek()==HttpTokens.LINE_FEED)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	542 _eol=_buffer.get();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	543
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	544 // We convert _contentLength to an int for this switch statement because
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	545 // we don't care about the amount of data available just whether there is some.
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	546 switch (_contentLength > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) _contentLength)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	547 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	548 case HttpTokens.EOF_CONTENT:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	549 _state=STATE_EOF_CONTENT;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	550 _handler.headerComplete(); // May recurse here !
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	551 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	552
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	553 case HttpTokens.CHUNKED_CONTENT:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	554 _state=STATE_CHUNKED_CONTENT;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	555 _handler.headerComplete(); // May recurse here !
220ad4853cda remove StreamEndPoint 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
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	558 case HttpTokens.NO_CONTENT:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	559 _handler.headerComplete();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	560 _state=_persistent\|\|(_responseStatus>=100&&_responseStatus<200)?STATE_END:STATE_SEEKING_EOF;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	561 _handler.messageComplete(_contentPosition);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	562 return 1;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	563
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	564 default:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	565 _state=STATE_CONTENT;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	566 _handler.headerComplete(); // May recurse here !
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	567 break;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	568 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	569 return 1;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	570 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	571 else
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	572 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	573 // New header
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	574 _length=1;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	575 _buffer.mark();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	576 _state=STATE_HEADER_NAME;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	577
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	578 // try cached name!
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	579 if (array!=null)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	580 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	581 _cached=HttpHeaders.CACHE.getBest(array, _buffer.markIndex(), length+1);
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	582
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	583 if (_cached!=null)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	584 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	585 _length=_cached.length();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	586 _buffer.setGetIndex(_buffer.markIndex()+_length);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	587 length=_buffer.length();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	588 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	589 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	590 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	591 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	592 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	593
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	594 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	595
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	596 case STATE_HEADER_NAME:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	597 switch(ch)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	598 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	599 case HttpTokens.CARRIAGE_RETURN:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	600 case HttpTokens.LINE_FEED:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	601 if (_length > 0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	602 _tok0.update(_buffer.markIndex(), _buffer.markIndex() + _length);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	603 _eol=ch;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	604 _state=STATE_HEADER;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	605 break;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	606 case HttpTokens.COLON:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	607 if (_length > 0 && _cached==null)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	608 _tok0.update(_buffer.markIndex(), _buffer.markIndex() + _length);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	609 _length=-1;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	610 _state=STATE_HEADER_VALUE;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	611 break;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	612 case HttpTokens.SPACE:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	613 case HttpTokens.TAB:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	614 break;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	615 default:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	616 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	617 _cached=null;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	618 if (_length == -1)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	619 _buffer.mark();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	620 _length=_buffer.getIndex() - _buffer.markIndex();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	621 _state=STATE_HEADER_IN_NAME;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	622 }
220ad4853cda remove StreamEndPoint 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
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	625 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	626
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	627 case STATE_HEADER_IN_NAME:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	628 switch(ch)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	629 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	630 case HttpTokens.CARRIAGE_RETURN:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	631 case HttpTokens.LINE_FEED:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	632 if (_length > 0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	633 _tok0.update(_buffer.markIndex(), _buffer.markIndex() + _length);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	634 _eol=ch;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	635 _state=STATE_HEADER;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	636 break;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	637 case HttpTokens.COLON:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	638 if (_length > 0 && _cached==null)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	639 _tok0.update(_buffer.markIndex(), _buffer.markIndex() + _length);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	640 _length=-1;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	641 _state=STATE_HEADER_VALUE;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	642 break;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	643 case HttpTokens.SPACE:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	644 case HttpTokens.TAB:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	645 _state=STATE_HEADER_NAME;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	646 break;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	647 default:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	648 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	649 _cached=null;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	650 _length++;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	651 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	652 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	653 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	654
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	655 case STATE_HEADER_VALUE:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	656 switch(ch)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	657 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	658 case HttpTokens.CARRIAGE_RETURN:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	659 case HttpTokens.LINE_FEED:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	660 if (_length > 0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	661 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	662 if (_tok1.length() == 0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	663 _tok1.update(_buffer.markIndex(), _buffer.markIndex() + _length);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	664 else
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	665 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	666 // Continuation line!
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	667 if (_multiLineValue == null) _multiLineValue=_tok1.toString(StringUtil.__ISO_8859_1);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	668 _tok1.update(_buffer.markIndex(), _buffer.markIndex() + _length);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	669 _multiLineValue += " " + _tok1.toString(StringUtil.__ISO_8859_1);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	670 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	671 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	672 _eol=ch;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	673 _state=STATE_HEADER;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	674 break;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	675 case HttpTokens.SPACE:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	676 case HttpTokens.TAB:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	677 break;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	678 default:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	679 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	680 if (_length == -1)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	681 _buffer.mark();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	682 _length=_buffer.getIndex() - _buffer.markIndex();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	683 _state=STATE_HEADER_IN_VALUE;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	684 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	685 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	686 break;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	687
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	688 case STATE_HEADER_IN_VALUE:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	689 switch(ch)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	690 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	691 case HttpTokens.CARRIAGE_RETURN:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	692 case HttpTokens.LINE_FEED:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	693 if (_length > 0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	694 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	695 if (_tok1.length() == 0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	696 _tok1.update(_buffer.markIndex(), _buffer.markIndex() + _length);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	697 else
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	698 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	699 // Continuation line!
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	700 if (_multiLineValue == null) _multiLineValue=_tok1.toString(StringUtil.__ISO_8859_1);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	701 _tok1.update(_buffer.markIndex(), _buffer.markIndex() + _length);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	702 _multiLineValue += " " + _tok1.toString(StringUtil.__ISO_8859_1);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	703 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	704 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	705 _eol=ch;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	706 _state=STATE_HEADER;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	707 break;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	708 case HttpTokens.SPACE:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	709 case HttpTokens.TAB:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	710 _state=STATE_HEADER_VALUE;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	711 break;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	712 default:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	713 _length++;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	714 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	715 break;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	716 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	717 } // end of HEADER states loop
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	718
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	719 // ==========================
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	720
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	721 // Handle HEAD response
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	722 if (_responseStatus>0 && _headResponse)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	723 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	724 _state=_persistent\|\|(_responseStatus>=100&&_responseStatus<200)?STATE_END:STATE_SEEKING_EOF;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	725 _handler.messageComplete(_contentLength);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	726 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	727
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	728
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	729 // ==========================
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	730
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	731 // Handle _content
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	732 length=_buffer.length();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	733 Buffer chunk;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	734 last=_state;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	735 while (_state > STATE_END && length > 0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	736 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	737 if (last!=_state)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	738 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	739 progress++;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	740 last=_state;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	741 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	742
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	743 if (_eol == HttpTokens.CARRIAGE_RETURN && _buffer.peek() == HttpTokens.LINE_FEED)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	744 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	745 _eol=_buffer.get();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	746 length=_buffer.length();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	747 continue;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	748 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	749 _eol=0;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	750 switch (_state)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	751 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	752 case STATE_EOF_CONTENT:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	753 chunk=_buffer.get(_buffer.length());
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	754 _contentPosition += chunk.length();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	755 _contentView.update(chunk);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	756 _handler.content(chunk); // May recurse here
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	757 // TODO adjust the _buffer to keep unconsumed content
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	758 return 1;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	759
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	760 case STATE_CONTENT:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	761 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	762 long remaining=_contentLength - _contentPosition;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	763 if (remaining == 0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	764 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	765 _state=_persistent?STATE_END:STATE_SEEKING_EOF;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	766 _handler.messageComplete(_contentPosition);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	767 return 1;
220ad4853cda remove StreamEndPoint 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
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	770 if (length > remaining)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	771 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	772 // We can cast reamining to an int as we know that it is smaller than
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	773 // or equal to length which is already an int.
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	774 length=(int)remaining;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	775 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	776
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	777 chunk=_buffer.get(length);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	778 _contentPosition += chunk.length();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	779 _contentView.update(chunk);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	780 _handler.content(chunk); // May recurse here
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	781
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	782 if(_contentPosition == _contentLength)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	783 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	784 _state=_persistent?STATE_END:STATE_SEEKING_EOF;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	785 _handler.messageComplete(_contentPosition);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	786 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	787 // TODO adjust the _buffer to keep unconsumed content
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	788 return 1;
220ad4853cda remove StreamEndPoint 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
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	791 case STATE_CHUNKED_CONTENT:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	792 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	793 ch=_buffer.peek();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	794 if (ch == HttpTokens.CARRIAGE_RETURN \|\| ch == HttpTokens.LINE_FEED)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	795 _eol=_buffer.get();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	796 else if (ch <= HttpTokens.SPACE)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	797 _buffer.get();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	798 else
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	799 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	800 _chunkLength=0;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	801 _chunkPosition=0;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	802 _state=STATE_CHUNK_SIZE;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	803 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	804 break;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	805 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	806
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	807 case STATE_CHUNK_SIZE:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	808 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	809 ch=_buffer.get();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	810 if (ch == HttpTokens.CARRIAGE_RETURN \|\| ch == HttpTokens.LINE_FEED)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	811 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	812 _eol=ch;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	813
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	814 if (_chunkLength == 0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	815 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	816 if (_eol==HttpTokens.CARRIAGE_RETURN && _buffer.hasContent() && _buffer.peek()==HttpTokens.LINE_FEED)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	817 _eol=_buffer.get();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	818 _state=_persistent?STATE_END:STATE_SEEKING_EOF;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	819 _handler.messageComplete(_contentPosition);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	820 return 1;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	821 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	822 else
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	823 _state=STATE_CHUNK;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	824 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	825 else if (ch <= HttpTokens.SPACE \|\| ch == HttpTokens.SEMI_COLON)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	826 _state=STATE_CHUNK_PARAMS;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	827 else if (ch >= '0' && ch <= '9')
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	828 _chunkLength=_chunkLength * 16 + (ch - '0');
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	829 else if (ch >= 'a' && ch <= 'f')
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	830 _chunkLength=_chunkLength * 16 + (10 + ch - 'a');
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	831 else if (ch >= 'A' && ch <= 'F')
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	832 _chunkLength=_chunkLength * 16 + (10 + ch - 'A');
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	833 else
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	834 throw new IOException("bad chunk char: " + ch);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	835 break;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	836 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	837
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	838 case STATE_CHUNK_PARAMS:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	839 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	840 ch=_buffer.get();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	841 if (ch == HttpTokens.CARRIAGE_RETURN \|\| ch == HttpTokens.LINE_FEED)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	842 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	843 _eol=ch;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	844 if (_chunkLength == 0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	845 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	846 if (_eol==HttpTokens.CARRIAGE_RETURN && _buffer.hasContent() && _buffer.peek()==HttpTokens.LINE_FEED)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	847 _eol=_buffer.get();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	848 _state=_persistent?STATE_END:STATE_SEEKING_EOF;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	849 _handler.messageComplete(_contentPosition);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	850 return 1;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	851 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	852 else
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	853 _state=STATE_CHUNK;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	854 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	855 break;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	856 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	857
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	858 case STATE_CHUNK:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	859 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	860 int remaining=_chunkLength - _chunkPosition;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	861 if (remaining == 0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	862 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	863 _state=STATE_CHUNKED_CONTENT;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	864 break;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	865 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	866 else if (length > remaining)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	867 length=remaining;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	868 chunk=_buffer.get(length);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	869 _contentPosition += chunk.length();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	870 _chunkPosition += chunk.length();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	871 _contentView.update(chunk);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	872 _handler.content(chunk); // May recurse here
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	873 // TODO adjust the _buffer to keep unconsumed content
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	874 return 1;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	875 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	876
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	877 case STATE_SEEKING_EOF:
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	878 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	879 // Close if there is more data than CRLF
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	880 if (_buffer.length()>2)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	881 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	882 _state=STATE_END;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	883 _endp.close();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	884 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	885 else
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	886 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	887 // or if the data is not white space
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	888 while (_buffer.length()>0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	889 if (!Character.isWhitespace(_buffer.get()))
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	890 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	891 _state=STATE_END;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	892 _endp.close();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	893 _buffer.clear();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	894 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	895 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	896
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	897 _buffer.clear();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	898 break;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	899 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	900 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	901
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	902 length=_buffer.length();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	903 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	904
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	905 return progress;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	906 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	907 catch(HttpException e)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	908 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	909 _persistent=false;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	910 _state=STATE_SEEKING_EOF;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	911 throw e;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	912 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	913 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	914
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	915 /* ------------------------------------------------------------------------------- */
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	916 /** fill the buffers from the endpoint
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	917 *
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	918 */
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	919 private int fill() throws IOException
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	920 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	921 // Do we have a buffer?
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	922 if (_buffer==null)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	923 _buffer=getHeaderBuffer();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	924
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	925 // Is there unconsumed content in body buffer
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	926 if (_state>STATE_END && _buffer==_header && _header!=null && !_header.hasContent() && _body!=null && _body.hasContent())
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	927 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	928 _buffer=_body;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	929 return _buffer.length();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	930 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	931
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	932 // Shall we switch to a body buffer?
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	933 if (_buffer==_header && _state>STATE_END && _header.length()==0 && ((_contentLength-_contentPosition)>_header.capacity()) && (_body!=null\|\|_buffers!=null))
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	934 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	935 if (_body==null)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	936 _body=_buffers.getBuffer();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	937 _buffer=_body;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	938 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	939
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	940 // Shall we compact the body?
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	941 if (_buffer==_body \|\| _state>STATE_END)
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	942 {
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	943 _buffer.compact();
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	944 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	945
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	946 // Are we full?
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	947 if (_buffer.space() == 0)
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	948 {
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	949 LOG.warn("HttpParser Full for {} ",_endp);
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	950 _buffer.clear();
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	951 throw new HttpException(HttpStatus.REQUEST_ENTITY_TOO_LARGE_413, "Request Entity Too Large: "+(_buffer==_body?"body":"head"));
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	952 }
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	953
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	954 try
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	955 {
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	956 int filled = _endp.fill(_buffer);
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	957 return filled;
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	958 }
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	959 catch(IOException e)
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	960 {
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	961 LOG.debug("",e);
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	962 throw (e instanceof EofException) ? e:new EofException(e);
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	963 }
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	964 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	965
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	966 public void reset()
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	967 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	968 // reset state
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	969 _contentView.setGetIndex(_contentView.putIndex());
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	970 _state=_persistent?STATE_START:(_endp.isInputShutdown()?STATE_END:STATE_SEEKING_EOF);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	971 _contentLength=HttpTokens.UNKNOWN_CONTENT;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	972 _contentPosition=0;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	973 _length=0;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	974 _responseStatus=0;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	975
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	976 // Consume LF if CRLF
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	977 if (_eol == HttpTokens.CARRIAGE_RETURN && _buffer!=null && _buffer.hasContent() && _buffer.peek() == HttpTokens.LINE_FEED)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	978 _eol=_buffer.get();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	979
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	980 if (_body!=null && _body.hasContent())
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	981 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	982 // There is content in the body after the end of the request.
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	983 // This is probably a pipelined header of the next request, so we need to
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	984 // copy it to the header buffer.
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	985 if (_header==null)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	986 getHeaderBuffer();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	987 else
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	988 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	989 _header.setMarkIndex(-1);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	990 _header.compact();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	991 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	992 int take=_header.space();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	993 if (take>_body.length())
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	994 take=_body.length();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	995 _body.peek(_body.getIndex(),take);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	996 _body.skip(_header.put(_body.peek(_body.getIndex(),take)));
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	997 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	998
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	999 if (_header!=null)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1000 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1001 _header.setMarkIndex(-1);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1002 _header.compact();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1003 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1004 if (_body!=null)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1005 _body.setMarkIndex(-1);
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1006
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1007 _buffer=_header;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1008 returnBuffers();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1009 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1010
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1011
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1012 public void returnBuffers()
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1013 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1014 if (_body!=null && !_body.hasContent() && _body.markIndex()==-1 && _buffers!=null)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1015 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1016 if (_buffer==_body)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1017 _buffer=_header;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1018 if (_buffers!=null)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1019 _buffers.returnBuffer(_body);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1020 _body=null;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1021 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1022
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1023 if (_header!=null && !_header.hasContent() && _header.markIndex()==-1 && _buffers!=null)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1024 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1025 if (_buffer==_header)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1026 _buffer=null;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1027 _buffers.returnBuffer(_header);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1028 _header=null;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1029 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1030 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1031
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1032 @Override
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1033 public String toString()
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1034 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1035 return String.format("%s{s=%d,l=%d,c=%d}",
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1036 getClass().getSimpleName(),
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1037 _state,
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1038 _length,
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1039 _contentLength);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1040 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1041
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1042 public Buffer getHeaderBuffer()
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1043 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1044 if (_header == null)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1045 {
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	1046 _header = _buffers.getHeader();
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1047 _tok0.update(_header);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1048 _tok1.update(_header);
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1049 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1050 return _header;
220ad4853cda remove StreamEndPoint 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
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1053 public Buffer blockForContent(long maxIdleTime) throws IOException
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1054 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1055 if (_contentView.length()>0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1056 return _contentView;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1057
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	1058 if (_state <= STATE_END \|\| _state==STATE_SEEKING_EOF)
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1059 return null;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1060
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1061 try
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1062 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1063 parseNext();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1064
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1065 // parse until some progress is made (or IOException thrown for timeout)
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	1066 while(_contentView.length() == 0 && !(_state==STATE_END\|\|_state==STATE_SEEKING_EOF) && _endp.isOpen())
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1067 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1068 if (!_endp.isBlocking())
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1069 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1070 if (parseNext()>0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1071 continue;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1072
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1073 if (!_endp.blockReadable(maxIdleTime))
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1074 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1075 _endp.close();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1076 throw new EofException("timeout");
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1077 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1078 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1079
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1080 parseNext();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1081 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1082 }
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1083 catch(IOException e)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1084 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1085 // TODO is this needed?
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1086 _endp.close();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1087 throw e;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1088 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1089
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1090 return _contentView.length()>0?_contentView:null;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1091 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1092
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1093 /* ------------------------------------------------------------ */
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1094 /* (non-Javadoc)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1095 * @see java.io.InputStream#available()
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1096 */
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1097 public int available() throws IOException
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1098 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1099 if (_contentView!=null && _contentView.length()>0)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1100 return _contentView.length();
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1101
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1102 if (_endp.isBlocking())
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1103 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1104 return 0;
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1105 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1106
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1107 parseNext();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1108 return _contentView==null?0:_contentView.length();
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1109 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1110
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	1111
bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	1112 public interface EventHandler
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1113 {
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1114 public abstract void content(Buffer ref) throws IOException;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1115
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	1116 public void headerComplete() throws IOException;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1117
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	1118 public void messageComplete(long contentLength) throws IOException;
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1119
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1120 /**
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1121 * This is the method called by parser when a HTTP Header name and value is found
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1122 */
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	1123 public void parsedHeader(Buffer name, Buffer value) throws IOException;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1124
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1125 /**
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1126 * This is the method called by parser when the HTTP request line is parsed
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1127 */
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1128 public abstract void startRequest(Buffer method, Buffer url, Buffer version)
220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1129 throws IOException;
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1130
980 bd26bd9320e2 simplify HttpParser Franklin Schmidt <fschmidt@gmail.com> parents: 979 diff changeset	1131 public void earlyEOF();
873 220ad4853cda remove StreamEndPoint Franklin Schmidt <fschmidt@gmail.com> parents: 820 diff changeset	1132 }
802 3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1133
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1134
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1135
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1136
3428c60d7cfc replace jetty jars with source Franklin Schmidt <fschmidt@gmail.com> parents: diff changeset	1137 }

Mercurial Hosting > luan

annotate src/org/eclipse/jetty/http/HttpParser.java @ 980:bd26bd9320e2