annotate src/org/eclipse/jetty/server/AbstractHttpConnection.java @ 1054:87275900646e

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