annotate src/org/eclipse/jetty/server/AbstractHttpConnection.java @ 1020:6be43ef1eb96

HttpHeaderValues uses StringCache
author Franklin Schmidt <fschmidt@gmail.com>
date Mon, 31 Oct 2016 22:24:41 -0600
parents f126d30e04a4
children e350c11242be
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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.server;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
20
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
21 import java.io.IOException;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
22 import java.io.InputStream;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
23 import java.io.PrintWriter;
985
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
24 import java.io.Writer;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
25
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
26 import javax.servlet.ServletInputStream;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
27 import javax.servlet.ServletOutputStream;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
28 import javax.servlet.http.HttpServletRequest;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
29 import javax.servlet.http.HttpServletResponse;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
30
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
31 import org.eclipse.jetty.http.HttpException;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
32 import org.eclipse.jetty.http.HttpFields;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
33 import org.eclipse.jetty.http.HttpGenerator;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
34 import org.eclipse.jetty.http.HttpHeaderValues;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
35 import org.eclipse.jetty.http.HttpHeaders;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
36 import org.eclipse.jetty.http.HttpMethods;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
37 import org.eclipse.jetty.http.HttpParser;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
38 import org.eclipse.jetty.http.HttpStatus;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
39 import org.eclipse.jetty.http.HttpURI;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
40 import org.eclipse.jetty.http.HttpVersions;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
41 import org.eclipse.jetty.http.MimeTypes;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
42 import org.eclipse.jetty.io.AbstractConnection;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
43 import org.eclipse.jetty.io.Buffer;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
44 import org.eclipse.jetty.io.BufferCache.CachedBuffer;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
45 import org.eclipse.jetty.io.Buffers;
985
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
46 import org.eclipse.jetty.io.ByteArrayBuffer;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
47 import org.eclipse.jetty.io.EndPoint;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
48 import org.eclipse.jetty.io.EofException;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
49 import org.eclipse.jetty.io.RuntimeIOException;
985
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
50 import org.eclipse.jetty.util.ByteArrayOutputStream2;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
51 import org.eclipse.jetty.util.QuotedStringTokenizer;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
52 import org.eclipse.jetty.util.StringUtil;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
53 import org.eclipse.jetty.util.URIUtil;
820
8e9db0bbf4f9 remove org.eclipse.jetty.util.log and upgrade slf4j
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
54 import org.slf4j.Logger;
8e9db0bbf4f9 remove org.eclipse.jetty.util.log and upgrade slf4j
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
55 import org.slf4j.LoggerFactory;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
56 import org.eclipse.jetty.util.resource.Resource;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
57
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
58 /**
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
59 * <p>A HttpConnection represents the connection of a HTTP client to the server
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
60 * and is created by an instance of a {@link Connector}. It's prime function is
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
61 * to associate {@link Request} and {@link Response} instances with a {@link EndPoint}.
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
62 * </p>
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
63 * <p>
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
64 * A connection is also the prime mechanism used by jetty to recycle objects without
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
65 * pooling. The {@link Request}, {@link Response}, {@link HttpParser}, {@link HttpGenerator}
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
66 * and {@link HttpFields} instances are all recycled for the duraction of
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
67 * a connection. Where appropriate, allocated buffers are also kept associated
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
68 * with the connection via the parser and/or generator.
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
69 * </p>
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
70 * <p>
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
71 * The connection state is held by 3 separate state machines: The request state, the
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
72 * response state and the continuation state. All three state machines must be driven
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
73 * to completion for every request, and all three can complete in any order.
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
74 * </p>
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
75 * <p>
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
76 * The HttpConnection support protocol upgrade. If on completion of a request, the
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
77 * response code is 101 (switch protocols), then the org.eclipse.jetty.io.Connection
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
78 * request attribute is checked to see if there is a new Connection instance. If so,
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
79 * the new connection is returned from {@link #handle()} and is used for future
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
80 * handling of the underlying connection. Note that for switching protocols that
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
81 * don't use 101 responses (eg CONNECT), the response should be sent and then the
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
82 * status code changed to 101 before returning from the handler. Implementors
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
83 * of new Connection types should be careful to extract any buffered data from
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
84 * (HttpParser)http.getParser()).getHeaderBuffer() and
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
85 * (HttpParser)http.getParser()).getBodyBuffer() to initialise their new connection.
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
86 * </p>
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
87 *
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
88 */
982
dbecd7faa1f5 remove Generator
Franklin Schmidt <fschmidt@gmail.com>
parents: 981
diff changeset
89 public abstract class AbstractHttpConnection extends AbstractConnection
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
90 {
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
91 private static final Logger LOG = LoggerFactory.getLogger(AbstractHttpConnection.class);
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
92
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
93 private final Connector _connector;
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
94 private final Server _server;
1013
6939226e0ac4 simplify URIUtil
Franklin Schmidt <fschmidt@gmail.com>
parents: 1010
diff changeset
95 protected final HttpURI _uri = new HttpURI();
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
96
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
97 protected final HttpParser _parser;
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
98 protected final HttpFields _requestFields = new HttpFields();
1015
0114d373748e remove recycle()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1014
diff changeset
99 public volatile Request _request;
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
100 private volatile ServletInputStream _in;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
101
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
102 protected final HttpGenerator _generator;
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
103 final HttpFields _responseFields = new HttpFields();
1015
0114d373748e remove recycle()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1014
diff changeset
104 protected volatile Response _response;
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
105 private volatile Output _out;
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
106 private volatile HttpWriter _writer;
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
107 private volatile PrintWriter _printWriter;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
108
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
109 private int _version = -2; // UNKNOWN
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
110
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
111 private String _charset;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
112 private boolean _expect = false;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
113 private boolean _expect100Continue = false;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
114 private boolean _head = false;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
115 private boolean _host = false;
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
116 private boolean _delayedHandling = false;
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
117 private boolean _earlyEOF = false;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
118
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
119 protected AbstractHttpConnection(Connector connector, EndPoint endpoint)
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
120 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
121 super(endpoint);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
122 _connector = connector;
1007
945568ee77ac remove HttpBuffersImpl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1005
diff changeset
123 _parser = new HttpParser(_connector.getRequestBuffers(), endpoint, new RequestHandler());
1015
0114d373748e remove recycle()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1014
diff changeset
124 _generator = new HttpGenerator(_connector.getResponseBuffers(), endpoint);
0114d373748e remove recycle()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1014
diff changeset
125 _server = connector.server;
0114d373748e remove recycle()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1014
diff changeset
126 init();
0114d373748e remove recycle()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1014
diff changeset
127 }
0114d373748e remove recycle()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1014
diff changeset
128
0114d373748e remove recycle()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1014
diff changeset
129 private void init() {
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
130 _request = new Request(this);
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
131 _response = new Response(this);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
132 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
133
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
134 public final Connector getConnector()
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
135 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
136 return _connector;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
137 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
138
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
139 public final Request getRequest()
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
140 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
141 return _request;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
142 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
143
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
144 public final Response getResponse()
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
145 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
146 return _response;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
147 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
148
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
149 /* ------------------------------------------------------------ */
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
150 /**
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
151 * Get the inputStream from the connection.
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
152 * <p>
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
153 * If the associated response has the Expect header set to 100 Continue,
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
154 * then accessing the input stream indicates that the handler/servlet
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
155 * is ready for the request body and thus a 100 Continue response is sent.
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
156 *
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
157 * @return The input stream for this connection.
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
158 * The stream will be created if it does not already exist.
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
159 * @throws IOException if the input stream cannot be retrieved
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
160 */
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
161 public final ServletInputStream getInputStream() throws IOException
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
162 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
163 // If the client is expecting 100 CONTINUE, then send it now.
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
164 if (_expect100Continue)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
165 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
166 // is content missing?
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
167 if (_parser.getHeaderBuffer()==null || _parser.getHeaderBuffer().length()<2)
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
168 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
169 if (_generator.isCommitted())
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
170 throw new IllegalStateException("Committed before 100 Continues");
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
171
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
172 _generator.send1xx(HttpStatus.CONTINUE_100);
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
173 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
174 _expect100Continue=false;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
175 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
176
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
177 if (_in == null)
981
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
178 _in = new HttpInput();
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
179 return _in;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
180 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
181
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
182 /* ------------------------------------------------------------ */
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
183 /**
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
184 * @return The output stream for this connection. The stream will be created if it does not already exist.
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
185 */
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
186 public final ServletOutputStream getOutputStream()
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
187 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
188 if (_out == null)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
189 _out = new Output();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
190 return _out;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
191 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
192
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
193 /* ------------------------------------------------------------ */
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
194 /**
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
195 * @param encoding the PrintWriter encoding
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
196 * @return A {@link PrintWriter} wrapping the {@link #getOutputStream output stream}. The writer is created if it
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
197 * does not already exist.
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
198 */
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
199 public final PrintWriter getPrintWriter(String encoding)
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
200 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
201 getOutputStream();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
202 if (_writer==null)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
203 {
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
204 _writer = new HttpWriter(_out);
882
d850a5e6ff15 remove UncheckedPrintWriter
Franklin Schmidt <fschmidt@gmail.com>
parents: 878
diff changeset
205 _printWriter = new PrintWriter(_writer)
d850a5e6ff15 remove UncheckedPrintWriter
Franklin Schmidt <fschmidt@gmail.com>
parents: 878
diff changeset
206 {
d850a5e6ff15 remove UncheckedPrintWriter
Franklin Schmidt <fschmidt@gmail.com>
parents: 878
diff changeset
207 public void close()
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
208 {
882
d850a5e6ff15 remove UncheckedPrintWriter
Franklin Schmidt <fschmidt@gmail.com>
parents: 878
diff changeset
209 synchronized (lock)
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
210 {
882
d850a5e6ff15 remove UncheckedPrintWriter
Franklin Schmidt <fschmidt@gmail.com>
parents: 878
diff changeset
211 try
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
212 {
882
d850a5e6ff15 remove UncheckedPrintWriter
Franklin Schmidt <fschmidt@gmail.com>
parents: 878
diff changeset
213 out.close();
d850a5e6ff15 remove UncheckedPrintWriter
Franklin Schmidt <fschmidt@gmail.com>
parents: 878
diff changeset
214 }
d850a5e6ff15 remove UncheckedPrintWriter
Franklin Schmidt <fschmidt@gmail.com>
parents: 878
diff changeset
215 catch (IOException e)
d850a5e6ff15 remove UncheckedPrintWriter
Franklin Schmidt <fschmidt@gmail.com>
parents: 878
diff changeset
216 {
d850a5e6ff15 remove UncheckedPrintWriter
Franklin Schmidt <fschmidt@gmail.com>
parents: 878
diff changeset
217 setError();
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
218 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
219 }
882
d850a5e6ff15 remove UncheckedPrintWriter
Franklin Schmidt <fschmidt@gmail.com>
parents: 878
diff changeset
220 }
d850a5e6ff15 remove UncheckedPrintWriter
Franklin Schmidt <fschmidt@gmail.com>
parents: 878
diff changeset
221 };
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
222 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
223 _writer.setCharacterEncoding(encoding);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
224 return _printWriter;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
225 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
226
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
227 protected void reset()
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
228 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
229 _parser.reset();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
230 _requestFields.clear();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
231 _generator.reset();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
232 _generator.returnBuffers();// TODO maybe only on unhandle
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
233 _responseFields.clear();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
234 _uri.clear();
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
235 _writer = null;
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
236 _earlyEOF = false;
1015
0114d373748e remove recycle()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1014
diff changeset
237 init();
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
238 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
239
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
240 private void handleRequest() throws IOException
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
241 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
242 boolean error = false;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
243
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
244 try
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
245 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
246 // Loop here to handle async request redispatches.
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
247 // The loop is controlled by the call to async.unhandle in the
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
248 // finally block below. If call is from a non-blocking connector,
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
249 // then the unhandle will return false only if an async dispatch has
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
250 // already happened when unhandle is called. For a blocking connector,
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
251 // the wait for the asynchronous dispatch or timeout actually happens
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
252 // within the call to unhandle().
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
253
939
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
254 _request.setHandled(false);
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
255
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
256 String info=null;
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
257 try
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
258 {
939
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
259 _uri.getPort();
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
260 String path = null;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
261
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
262 try
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
263 {
939
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
264 path = _uri.getDecodedPath();
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
265 }
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
266 catch (Exception e)
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
267 {
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
268 LOG.warn("Failed UTF-8 decode for request path, trying ISO-8859-1");
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
269 LOG.trace("",e);
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
270 path = _uri.getDecodedPath(StringUtil.__ISO_8859_1);
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
271 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
272
939
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
273 info = URIUtil.canonicalPath(path);
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
274 if (info==null && !_request.getMethod().equals(HttpMethods.CONNECT))
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
275 {
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
276 if (path==null && _uri.getScheme()!=null && _uri.getHost()!=null)
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
277 {
939
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
278 info="/";
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
279 _request.setRequestURI("");
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
280 }
939
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
281 else
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
282 throw new HttpException(400);
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
283 }
939
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
284 _request.setPathInfo(info);
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
285
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
286 if (_out!=null)
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
287 _out.reopen();
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
288
1001
Franklin Schmidt <fschmidt@gmail.com>
parents: 999
diff changeset
289 _connector.customize(this);
939
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
290 _server.handle(this);
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
291 }
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
292 catch (EofException e)
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
293 {
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
294 LOG.debug("",e);
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
295 error=true;
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
296 _request.setHandled(true);
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
297 if (!_response.isCommitted())
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
298 _generator.sendError(500, null, null, true);
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
299 }
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
300 catch (RuntimeIOException e)
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
301 {
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
302 LOG.debug("",e);
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
303 error=true;
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
304 _request.setHandled(true);
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
305 }
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
306 catch (HttpException e)
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
307 {
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
308 LOG.debug("",e);
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
309 error=true;
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
310 _request.setHandled(true);
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
311 _response.sendError(e.getStatus(), e.getReason());
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
312 }
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
313 catch (Throwable e)
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
314 {
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
315 LOG.warn(String.valueOf(_uri),e);
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
316 error=true;
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
317 _request.setHandled(true);
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
318 _generator.sendError(info==null?400:500, null, null, true);
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
319
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
320 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
321 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
322 finally
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
323 {
939
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
324 if (_expect100Continue)
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
325 {
939
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
326 LOG.debug("100 continues not sent");
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
327 // We didn't send 100 continues, but the latest interpretation
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
328 // of the spec (see httpbis) is that the client will either
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
329 // send the body anyway, or close. So we no longer need to
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
330 // do anything special here other than make the connection not persistent
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
331 _expect100Continue = false;
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
332 if (!_response.isCommitted())
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
333 _generator.setPersistent(false);
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
334 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
335
939
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
336 if(_endp.isOpen())
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
337 {
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
338 if (error)
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
339 {
939
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
340 _endp.shutdownOutput();
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
341 _generator.setPersistent(false);
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
342 if (!_generator.isComplete())
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
343 _response.complete();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
344 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
345 else
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
346 {
939
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
347 if (!_response.isCommitted() && !_request.isHandled())
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
348 _response.sendError(HttpServletResponse.SC_NOT_FOUND);
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
349 _response.complete();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
350 }
939
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
351 }
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
352 else
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
353 {
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
354 _response.complete();
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
355 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
356
939
8db5996c8c89 remove AsyncContinuation
Franklin Schmidt <fschmidt@gmail.com>
parents: 934
diff changeset
357 _request.setHandled(true);
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
358 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
359 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
360
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
361
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
362 public final void commitResponse(boolean last) throws IOException
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
363 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
364 if (!_generator.isCommitted())
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
365 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
366 _generator.setResponse(_response.getStatus(), _response.getReason());
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
367 try
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
368 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
369 // If the client was expecting 100 continues, but we sent something
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
370 // else, then we need to close the connection
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
371 if (_expect100Continue && _response.getStatus()!=100)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
372 _generator.setPersistent(false);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
373 _generator.completeHeader(_responseFields, last);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
374 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
375 catch(RuntimeException e)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
376 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
377 LOG.warn("header full: " + e);
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
378
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
379 _response.reset();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
380 _generator.reset();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
381 _generator.setResponse(HttpStatus.INTERNAL_SERVER_ERROR_500,null);
982
dbecd7faa1f5 remove Generator
Franklin Schmidt <fschmidt@gmail.com>
parents: 981
diff changeset
382 _generator.completeHeader(_responseFields,HttpGenerator.LAST);
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
383 _generator.complete();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
384 throw new HttpException(HttpStatus.INTERNAL_SERVER_ERROR_500);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
385 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
386
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
387 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
388 if (last)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
389 _generator.complete();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
390 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
391
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
392 public final void completeResponse() throws IOException
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
393 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
394 if (!_generator.isCommitted())
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
395 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
396 _generator.setResponse(_response.getStatus(), _response.getReason());
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
397 try
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
398 {
982
dbecd7faa1f5 remove Generator
Franklin Schmidt <fschmidt@gmail.com>
parents: 981
diff changeset
399 _generator.completeHeader(_responseFields, HttpGenerator.LAST);
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
400 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
401 catch(RuntimeException e)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
402 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
403 LOG.warn("header full: "+e);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
404 LOG.debug("",e);
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
405
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
406 _response.reset();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
407 _generator.reset();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
408 _generator.setResponse(HttpStatus.INTERNAL_SERVER_ERROR_500,null);
982
dbecd7faa1f5 remove Generator
Franklin Schmidt <fschmidt@gmail.com>
parents: 981
diff changeset
409 _generator.completeHeader(_responseFields,HttpGenerator.LAST);
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
410 _generator.complete();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
411 throw new HttpException(HttpStatus.INTERNAL_SERVER_ERROR_500);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
412 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
413 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
414
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
415 _generator.complete();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
416 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
417
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
418 public final void flushResponse() throws IOException
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
419 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
420 try
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
421 {
982
dbecd7faa1f5 remove Generator
Franklin Schmidt <fschmidt@gmail.com>
parents: 981
diff changeset
422 commitResponse(HttpGenerator.MORE);
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
423 _generator.flushBuffer();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
424 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
425 catch(IOException e)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
426 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
427 throw (e instanceof EofException) ? e:new EofException(e);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
428 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
429 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
430
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
431 public final int getMaxIdleTime()
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
432 {
996
d9cfec64899c simplify Connector
Franklin Schmidt <fschmidt@gmail.com>
parents: 991
diff changeset
433 if (_connector.server.isLowOnThreads() && _endp.getMaxIdleTime()==_connector.getMaxIdleTime())
913
17f4fe8271de simplify connectors
Franklin Schmidt <fschmidt@gmail.com>
parents: 911
diff changeset
434 return 0;
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
435 if (_endp.getMaxIdleTime()>0)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
436 return _endp.getMaxIdleTime();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
437 return _connector.getMaxIdleTime();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
438 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
439
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
440 @Override
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
441 public String toString()
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
442 {
1001
Franklin Schmidt <fschmidt@gmail.com>
parents: 999
diff changeset
443 return String.format("%s,g=%s,p=%s",
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
444 super.toString(),
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
445 _generator,
1001
Franklin Schmidt <fschmidt@gmail.com>
parents: 999
diff changeset
446 _parser);
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
447 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
448
1019
f126d30e04a4 start replacing BufferCache with StringCache
Franklin Schmidt <fschmidt@gmail.com>
parents: 1017
diff changeset
449 private void startRequest(String method, Buffer uri, String version) throws IOException
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
450 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
451 uri=uri.asImmutableBuffer();
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
452
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
453 _host = false;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
454 _expect = false;
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
455 _expect100Continue = false;
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
456 _delayedHandling=false;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
457 _charset=null;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
458
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
459 if(_request.getTimeStamp()==0)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
460 _request.setTimeStamp(System.currentTimeMillis());
1019
f126d30e04a4 start replacing BufferCache with StringCache
Franklin Schmidt <fschmidt@gmail.com>
parents: 1017
diff changeset
461 _request.setMethod(method);
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
462
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
463 try
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
464 {
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
465 _head = false;
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
466 switch (HttpMethods.CACHE.getOrdinal(method))
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
467 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
468 case HttpMethods.CONNECT_ORDINAL:
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
469 _uri.parseConnect(uri.array(), uri.getIndex(), uri.length());
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
470 break;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
471
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
472 case HttpMethods.HEAD_ORDINAL:
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
473 _head = true;
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
474 _uri.parse(uri.array(), uri.getIndex(), uri.length());
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
475 break;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
476
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
477 default:
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
478 _uri.parse(uri.array(), uri.getIndex(), uri.length());
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
479 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
480
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
481 _request.setUri(_uri);
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
482
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
483 if (version==null)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
484 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
485 _request.setProtocol(HttpVersions.HTTP_0_9);
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
486 _version = HttpVersions.HTTP_0_9_ORDINAL;
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
487 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
488 else
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
489 {
1019
f126d30e04a4 start replacing BufferCache with StringCache
Franklin Schmidt <fschmidt@gmail.com>
parents: 1017
diff changeset
490 if (!HttpVersions.CACHE.contains(version))
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
491 throw new HttpException(HttpStatus.BAD_REQUEST_400,null);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
492 _version = HttpVersions.CACHE.getOrdinal(version);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
493 if (_version <= 0) _version = HttpVersions.HTTP_1_0_ORDINAL;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
494 _request.setProtocol(version.toString());
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
495 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
496 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
497 catch (Exception e)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
498 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
499 LOG.debug("",e);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
500 if (e instanceof HttpException)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
501 throw (HttpException)e;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
502 throw new HttpException(HttpStatus.BAD_REQUEST_400,null,e);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
503 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
504 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
505
1020
6be43ef1eb96 HttpHeaderValues uses StringCache
Franklin Schmidt <fschmidt@gmail.com>
parents: 1019
diff changeset
506 private void parsedHeader(Buffer name, String value) throws IOException
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
507 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
508 int ho = HttpHeaders.CACHE.getOrdinal(name);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
509 switch (ho)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
510 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
511 case HttpHeaders.HOST_ORDINAL:
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
512 // TODO check if host matched a host in the URI.
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
513 _host = true;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
514 break;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
515
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
516 case HttpHeaders.EXPECT_ORDINAL:
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
517 if (_version>=HttpVersions.HTTP_1_1_ORDINAL)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
518 {
1020
6be43ef1eb96 HttpHeaderValues uses StringCache
Franklin Schmidt <fschmidt@gmail.com>
parents: 1019
diff changeset
519 // value = HttpHeaderValues.CACHE.lookup(value);
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
520 switch(HttpHeaderValues.CACHE.getOrdinal(value))
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
521 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
522 case HttpHeaderValues.CONTINUE_ORDINAL:
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
523 _expect100Continue = true;
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
524 break;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
525
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
526 default:
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
527 String[] values = value.toString().split(",");
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
528 for (int i=0;values!=null && i<values.length;i++)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
529 {
1020
6be43ef1eb96 HttpHeaderValues uses StringCache
Franklin Schmidt <fschmidt@gmail.com>
parents: 1019
diff changeset
530 int cb = HttpHeaderValues.CACHE.getOrdinal(values[i].trim());
6be43ef1eb96 HttpHeaderValues uses StringCache
Franklin Schmidt <fschmidt@gmail.com>
parents: 1019
diff changeset
531 if (cb == -1)
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
532 _expect = true;
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
533 else
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
534 {
1020
6be43ef1eb96 HttpHeaderValues uses StringCache
Franklin Schmidt <fschmidt@gmail.com>
parents: 1019
diff changeset
535 switch(cb)
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
536 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
537 case HttpHeaderValues.CONTINUE_ORDINAL:
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
538 _expect100Continue = true;
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
539 break;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
540 default:
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
541 _expect = true;
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
542 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
543 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
544 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
545 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
546 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
547 break;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
548
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
549 case HttpHeaders.ACCEPT_ENCODING_ORDINAL:
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
550 case HttpHeaders.USER_AGENT_ORDINAL:
1020
6be43ef1eb96 HttpHeaderValues uses StringCache
Franklin Schmidt <fschmidt@gmail.com>
parents: 1019
diff changeset
551 // value = HttpHeaderValues.CACHE.lookup(value);
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
552 break;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
553
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
554 case HttpHeaders.CONTENT_TYPE_ORDINAL:
1020
6be43ef1eb96 HttpHeaderValues uses StringCache
Franklin Schmidt <fschmidt@gmail.com>
parents: 1019
diff changeset
555 // value = MimeTypes.CACHE.lookup(value);
6be43ef1eb96 HttpHeaderValues uses StringCache
Franklin Schmidt <fschmidt@gmail.com>
parents: 1019
diff changeset
556 _charset=MimeTypes.getCharsetFromContentType(new ByteArrayBuffer(value));
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
557 break;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
558 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
559
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
560 _requestFields.add(name, value);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
561 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
562
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
563 private void headerComplete() throws IOException
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
564 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
565 // Handle idle race
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
566 if (_endp.isOutputShutdown())
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
567 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
568 _endp.close();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
569 return;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
570 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
571
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
572 _generator.setVersion(_version);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
573 switch (_version)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
574 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
575 case HttpVersions.HTTP_0_9_ORDINAL:
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
576 break;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
577 case HttpVersions.HTTP_1_0_ORDINAL:
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
578 _generator.setHead(_head);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
579 if (_parser.isPersistent())
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
580 {
1020
6be43ef1eb96 HttpHeaderValues uses StringCache
Franklin Schmidt <fschmidt@gmail.com>
parents: 1019
diff changeset
581 _responseFields.add(HttpHeaders.CONNECTION_BUFFER, HttpHeaderValues.KEEP_ALIVE);
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
582 _generator.setPersistent(true);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
583 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
584 else if (HttpMethods.CONNECT.equals(_request.getMethod()))
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
585 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
586 _generator.setPersistent(true);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
587 _parser.setPersistent(true);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
588 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
589 break;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
590
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
591 case HttpVersions.HTTP_1_1_ORDINAL:
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
592 _generator.setHead(_head);
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
593
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
594 if (!_parser.isPersistent())
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
595 {
1020
6be43ef1eb96 HttpHeaderValues uses StringCache
Franklin Schmidt <fschmidt@gmail.com>
parents: 1019
diff changeset
596 _responseFields.add(HttpHeaders.CONNECTION_BUFFER,HttpHeaderValues.CLOSE);
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
597 _generator.setPersistent(false);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
598 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
599
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
600 if (!_host)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
601 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
602 LOG.debug("!host {}",this);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
603 _generator.setResponse(HttpStatus.BAD_REQUEST_400, null);
1020
6be43ef1eb96 HttpHeaderValues uses StringCache
Franklin Schmidt <fschmidt@gmail.com>
parents: 1019
diff changeset
604 _responseFields.put(HttpHeaders.CONNECTION_BUFFER, HttpHeaderValues.CLOSE);
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
605 _generator.completeHeader(_responseFields, true);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
606 _generator.complete();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
607 return;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
608 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
609
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
610 if (_expect)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
611 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
612 LOG.debug("!expectation {}",this);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
613 _generator.setResponse(HttpStatus.EXPECTATION_FAILED_417, null);
1020
6be43ef1eb96 HttpHeaderValues uses StringCache
Franklin Schmidt <fschmidt@gmail.com>
parents: 1019
diff changeset
614 _responseFields.put(HttpHeaders.CONNECTION_BUFFER, HttpHeaderValues.CLOSE);
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
615 _generator.completeHeader(_responseFields, true);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
616 _generator.complete();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
617 return;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
618 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
619
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
620 break;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
621 default:
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
622 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
623
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
624 if(_charset!=null)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
625 _request.setCharacterEncodingUnchecked(_charset);
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
626
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
627 // Either handle now or wait for first content
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
628 if ((_parser.getContentLength()<=0 && !_parser.isChunking())||_expect100Continue)
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
629 handleRequest();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
630 else
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
631 _delayedHandling = true;
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
632 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
633
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
634 private void content(Buffer buffer) throws IOException
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
635 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
636 if (_delayedHandling)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
637 {
974
7422ca1ae146 remove Connection.isIdle()
Franklin Schmidt <fschmidt@gmail.com>
parents: 972
diff changeset
638 _delayedHandling = false;
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
639 handleRequest();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
640 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
641 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
642
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
643 private void messageComplete(long contentLength) throws IOException
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
644 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
645 if (_delayedHandling)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
646 {
974
7422ca1ae146 remove Connection.isIdle()
Franklin Schmidt <fschmidt@gmail.com>
parents: 972
diff changeset
647 _delayedHandling = false;
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
648 handleRequest();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
649 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
650 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
651
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
652 private void earlyEOF()
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
653 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
654 _earlyEOF = true;
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
655 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
656
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
657
980
bd26bd9320e2 simplify HttpParser
Franklin Schmidt <fschmidt@gmail.com>
parents: 979
diff changeset
658 private class RequestHandler implements HttpParser.EventHandler
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
659 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
660 @Override
1019
f126d30e04a4 start replacing BufferCache with StringCache
Franklin Schmidt <fschmidt@gmail.com>
parents: 1017
diff changeset
661 public void startRequest(String method, Buffer uri, String version) throws IOException
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
662 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
663 AbstractHttpConnection.this.startRequest(method, uri, version);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
664 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
665
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
666 @Override
1020
6be43ef1eb96 HttpHeaderValues uses StringCache
Franklin Schmidt <fschmidt@gmail.com>
parents: 1019
diff changeset
667 public void parsedHeader(Buffer name, String value) throws IOException
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
668 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
669 AbstractHttpConnection.this.parsedHeader(name, value);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
670 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
671
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
672 @Override
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
673 public void headerComplete() throws IOException
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
674 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
675 AbstractHttpConnection.this.headerComplete();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
676 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
677
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
678 @Override
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
679 public void content(Buffer ref) throws IOException
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
680 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
681 AbstractHttpConnection.this.content(ref);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
682 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
683
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
684 @Override
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
685 public void messageComplete(long contentLength) throws IOException
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
686 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
687 AbstractHttpConnection.this.messageComplete(contentLength);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
688 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
689
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
690 @Override
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
691 public void earlyEOF()
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
692 {
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
693 AbstractHttpConnection.this.earlyEOF();
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
694 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
695 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
696
972
5ee36654b383 simplify AbstractHttpConnection
Franklin Schmidt <fschmidt@gmail.com>
parents: 965
diff changeset
697
985
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
698 public final class Output extends ServletOutputStream
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
699 {
985
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
700 private boolean _closed;
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
701 private ByteArrayBuffer _onebyte;
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
702
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
703 // These are held here for reuse by Writer
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
704 String _characterEncoding;
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
705 Writer _converter;
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
706 char[] _chars;
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
707 ByteArrayOutputStream2 _bytes;
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
708
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
709 public final void reopen()
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
710 {
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
711 _closed = false;
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
712 }
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
713
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
714 @Override
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
715 public final void write(byte[] b, int off, int len) throws IOException
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
716 {
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
717 write(new ByteArrayBuffer(b,off,len));
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
718 }
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
719
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
720 @Override
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
721 public final void write(byte[] b) throws IOException
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
722 {
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
723 write(new ByteArrayBuffer(b));
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
724 }
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
725
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
726 @Override
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
727 public final void write(int b) throws IOException
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
728 {
985
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
729 if (_onebyte==null)
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
730 _onebyte = new ByteArrayBuffer(1);
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
731 else
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
732 _onebyte.clear();
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
733 _onebyte.put((byte)b);
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
734 write(_onebyte);
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
735 }
985
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
736
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
737 private void write(Buffer buffer) throws IOException
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
738 {
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
739 if (_closed)
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
740 throw new IOException("Closed");
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
741 if (!_generator.isOpen())
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
742 throw new EofException();
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
743
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
744 // Block until we can add _content.
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
745 while (_generator.isBufferFull())
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
746 {
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
747 _generator.blockForOutput(getMaxIdleTime());
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
748 if (_closed)
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
749 throw new IOException("Closed");
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
750 if (!_generator.isOpen())
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
751 throw new EofException();
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
752 }
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
753
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
754 // Add the _content
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
755 _generator.addContent(buffer, HttpGenerator.MORE);
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
756
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
757 // Have to flush and complete headers?
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
758
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
759 if (_generator.isAllContentWritten())
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
760 {
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
761 flush();
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
762 close();
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
763 }
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
764 else if (_generator.isBufferFull())
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
765 commitResponse(HttpGenerator.MORE);
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
766
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
767 // Block until our buffer is free
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
768 while (buffer.length() > 0 && _generator.isOpen())
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
769 {
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
770 _generator.blockForOutput(getMaxIdleTime());
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
771 }
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
772 }
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
773
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
774
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
775
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
776 /* ------------------------------------------------------------ */
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
777 /*
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
778 * @see java.io.OutputStream#close()
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
779 */
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
780 @Override
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
781 public void close() throws IOException
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
782 {
985
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
783 if (_closed)
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
784 return;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
785
985
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
786 if (!_generator.isCommitted())
982
dbecd7faa1f5 remove Generator
Franklin Schmidt <fschmidt@gmail.com>
parents: 981
diff changeset
787 commitResponse(HttpGenerator.LAST);
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
788 else
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
789 flushResponse();
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
790
985
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
791 _closed = true;
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
792 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
793
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
794
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
795 /* ------------------------------------------------------------ */
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
796 /*
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
797 * @see java.io.OutputStream#flush()
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
798 */
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
799 @Override
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
800 public void flush() throws IOException
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
801 {
985
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
802 if (!_generator.isCommitted())
982
dbecd7faa1f5 remove Generator
Franklin Schmidt <fschmidt@gmail.com>
parents: 981
diff changeset
803 commitResponse(HttpGenerator.MORE);
985
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
804 _generator.flush(getMaxIdleTime());
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
805 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
806
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
807 /* ------------------------------------------------------------ */
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
808 /*
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
809 * @see javax.servlet.ServletOutputStream#print(java.lang.String)
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
810 */
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
811 @Override
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
812 public void print(String s) throws IOException
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
813 {
985
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
814 if (_closed)
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
815 throw new IOException("Closed");
985
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
816 PrintWriter writer = getPrintWriter(null);
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
817 writer.print(s);
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
818 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
819
1010
2712133d5bce simplify Buffer code
Franklin Schmidt <fschmidt@gmail.com>
parents: 1007
diff changeset
820 public final void sendContent(InputStream in) throws IOException
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
821 {
985
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
822 if (_closed)
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
823 throw new IOException("Closed");
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
824
985
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
825 if (_generator.isWritten())
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
826 throw new IllegalStateException("!empty");
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
827
1010
2712133d5bce simplify Buffer code
Franklin Schmidt <fschmidt@gmail.com>
parents: 1007
diff changeset
828 try
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
829 {
1010
2712133d5bce simplify Buffer code
Franklin Schmidt <fschmidt@gmail.com>
parents: 1007
diff changeset
830 int max = _generator.prepareUncheckedAddContent();
2712133d5bce simplify Buffer code
Franklin Schmidt <fschmidt@gmail.com>
parents: 1007
diff changeset
831 Buffer buffer = _generator.getUncheckedBuffer();
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
832
1010
2712133d5bce simplify Buffer code
Franklin Schmidt <fschmidt@gmail.com>
parents: 1007
diff changeset
833 int len = buffer.readFrom(in,max);
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
834
1010
2712133d5bce simplify Buffer code
Franklin Schmidt <fschmidt@gmail.com>
parents: 1007
diff changeset
835 while (len>=0)
2712133d5bce simplify Buffer code
Franklin Schmidt <fschmidt@gmail.com>
parents: 1007
diff changeset
836 {
985
8fef34f665e7 remove HttpOutput
Franklin Schmidt <fschmidt@gmail.com>
parents: 983
diff changeset
837 _generator.completeUncheckedAddContent();
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
838 _out.flush();
1010
2712133d5bce simplify Buffer code
Franklin Schmidt <fschmidt@gmail.com>
parents: 1007
diff changeset
839
2712133d5bce simplify Buffer code
Franklin Schmidt <fschmidt@gmail.com>
parents: 1007
diff changeset
840 max = _generator.prepareUncheckedAddContent();
2712133d5bce simplify Buffer code
Franklin Schmidt <fschmidt@gmail.com>
parents: 1007
diff changeset
841 buffer = _generator.getUncheckedBuffer();
2712133d5bce simplify Buffer code
Franklin Schmidt <fschmidt@gmail.com>
parents: 1007
diff changeset
842 len=buffer.readFrom(in,max);
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
843 }
1010
2712133d5bce simplify Buffer code
Franklin Schmidt <fschmidt@gmail.com>
parents: 1007
diff changeset
844 _generator.completeUncheckedAddContent();
2712133d5bce simplify Buffer code
Franklin Schmidt <fschmidt@gmail.com>
parents: 1007
diff changeset
845 _out.flush();
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
846 }
1010
2712133d5bce simplify Buffer code
Franklin Schmidt <fschmidt@gmail.com>
parents: 1007
diff changeset
847 finally
2712133d5bce simplify Buffer code
Franklin Schmidt <fschmidt@gmail.com>
parents: 1007
diff changeset
848 {
2712133d5bce simplify Buffer code
Franklin Schmidt <fschmidt@gmail.com>
parents: 1007
diff changeset
849 in.close();
2712133d5bce simplify Buffer code
Franklin Schmidt <fschmidt@gmail.com>
parents: 1007
diff changeset
850 }
981
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
851 }
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
852 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
853
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
854
981
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
855 private final class HttpInput extends ServletInputStream
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
856 {
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
857 /* ------------------------------------------------------------ */
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
858 /*
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
859 * @see java.io.InputStream#read()
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
860 */
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
861 @Override
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
862 public int read() throws IOException
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
863 {
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
864 byte[] bytes = new byte[1];
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
865 int read = read(bytes, 0, 1);
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
866 return read < 0 ? -1 : 0xff & bytes[0];
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
867 }
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
868
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
869 /* ------------------------------------------------------------ */
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
870 /*
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
871 * @see java.io.InputStream#read(byte[], int, int)
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
872 */
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
873 @Override
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
874 public int read(byte[] b, int off, int len) throws IOException
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
875 {
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
876 int l = -1;
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
877 Buffer content = _parser.blockForContent(getMaxIdleTime());
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
878 if (content!=null)
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
879 l = content.get(b, off, len);
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
880 else if (_earlyEOF)
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
881 throw new EofException("early EOF");
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
882 return l;
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
883 }
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
884
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
885 @Override
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
886 public int available() throws IOException
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
887 {
f46de416e219 remove HttpInput
Franklin Schmidt <fschmidt@gmail.com>
parents: 980
diff changeset
888 return _parser.available();
826
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
889 }
6ebf86e4d2ca remove HttpContent
Franklin Schmidt <fschmidt@gmail.com>
parents: 821
diff changeset
890 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
891
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
892 }