annotate src/org/eclipse/jetty/server/AbstractHttpConnection.java @ 1022:3718afd99988

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