annotate src/org/eclipse/jetty/server/AbstractHttpConnection.java @ 974:7422ca1ae146

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