Jesse McConnell
00ed549898
standardize license header blocks
2012-08-16 19:11:27 -05:00
Greg Wilkins
c84b496330
jetty-9 more work on stop/close. Turned on statistics all of the time, but still not enough. more work needed.
2012-08-12 11:24:24 +10:00
Greg Wilkins
488f53f8d6
jetty-9 cleaned up the stop and stopTimeout handlng
2012-08-11 12:51:32 +10:00
Joakim Erdfelt
74490580da
Merge branch 'jetty-9' into multimap-ng
2012-08-10 11:32:42 -07:00
Joakim Erdfelt
da0e5a1ef6
[multimap-ng] step 1, make MultiMap participate as a full fledged member of the Collections framework
2012-08-10 10:25:10 -07:00
Simone Bordet
c3dfd0c653
Jetty9 - Set stopTimeout to zero by default, and setting defaults for threaded component that need a non-zero stop timeout to stop properly.
2012-08-10 19:02:16 +02:00
Simone Bordet
136f7924fd
Jetty9 - Refactored usage of components that were using custom stop timeout to use the get/setStopTimeout() methods inherited from AbstractLifeCycle.
2012-08-10 19:02:16 +02:00
Greg Wilkins
1740b45342
jetty-9 Less reliance on booleans in SslConnection
2012-08-10 21:12:44 +10:00
Simone Bordet
6a2041ae27
Jetty9 - Better handling of cases where the SslConnection has its output shutdown.
2012-08-10 10:34:00 +02:00
Simone Bordet
2d832fa9ad
Jetty9 - Introduced Connection.close() for better stop of lifecycle components.
2012-08-10 10:32:45 +02:00
Simone Bordet
cf5801f437
Jetty9 - Added logging.
2012-08-10 10:31:35 +02:00
Greg Wilkins
afe489e986
jetty-9 potential SSL fix
2012-08-10 15:21:52 +10:00
Greg Wilkins
54ea5a7de2
jetty-9 better dispatching of events to SSL
2012-08-10 14:39:51 +10:00
Greg Wilkins
97ff08b3be
jetty-9 write on ssl connection test harness
2012-08-10 13:31:11 +10:00
Greg Wilkins
16b404754e
jetty-9 improved logging
2012-08-10 13:31:11 +10:00
Simone Bordet
523f1a8295
Jetty9 - Made close(), isOpen() and onOpen() use the _open AtomicBoolean for their logic, to avoid race conditions.
2012-08-08 14:58:04 +02:00
Simone Bordet
fe99631069
Jetty9 - Avoid to throw just after having written the SSL close message.
2012-08-08 11:28:53 +02:00
Simone Bordet
2816187e0d
Jetty9 - More logging.
2012-08-08 11:28:53 +02:00
Simone Bordet
cac1c933c3
Jetty9 - Prevented NPE in case the connection cannot be created.
2012-08-08 11:28:53 +02:00
Simone Bordet
d40170001a
Jetty9 - Removed call to onOpen() for the nested connection, it's not needed, and always calling completeWrite() from onFillable() in case there is application data left to be written.
...
Improved logging.
2012-08-08 11:28:53 +02:00
Greg Wilkins
32c5f6c093
jetty-9 reduced LazyList usage
2012-08-08 11:58:50 +10:00
Thomas Becker
d4d41fb877
jetty9 - fix WriteFlusherTest.testConcurrentAccessToIncompleteWriteAndOnFail()
2012-08-03 19:56:00 +02:00
Thomas Becker
5743483f9c
jetty9 - WriteFlusher.PendingState._buffers is final now
2012-08-03 19:27:35 +02:00
Thomas Becker
90112965b6
jetty9 - SelectChannelEndPoint.toString() fix
2012-08-03 19:10:21 +02:00
Simone Bordet
433839bd47
Jetty9 - Introduced ConnectionFactory for SelectChannelConnector.
...
This change abstracts out the connection creation from the connector itself,
so there can be only one connector managing all protocols, depending on
the configuration of the connection factories.
2012-08-03 19:10:21 +02:00
Thomas Becker
9f2d1586ca
jetty9 - WriteFlusher minor changes. Some ConcurrentTests for WriteFlusher added. Cleanup. Javadoc.
2012-08-03 19:10:18 +02:00
Greg Wilkins
2d7b6c9c06
jetty-9 some post simone review changes to WriteFlusher
2012-08-03 19:41:56 +10:00
Greg Wilkins
99a4b5955f
jetty-9 more common code in AbstractEndPoint
2012-08-03 15:51:21 +10:00
Greg Wilkins
40d4e1070f
jetty-9 renamed ReadInterest to fillInterest
2012-08-03 12:49:37 +10:00
Greg Wilkins
7df281bb16
jetty-9 renamed ReadInterest to fillInterest
2012-08-03 12:47:33 +10:00
Greg Wilkins
29833f000b
Merge branch 'jetty-9' into jetty-9-oneconnector
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/AsyncByteArrayEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java
jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
jetty-io/src/test/java/org/eclipse/jetty/io/WriteFlusherTest.java
2012-08-03 12:39:21 +10:00
Thomas Becker
137ccca7c5
jetty9 - Make WriteFlusher.java threadsafe
2012-08-03 01:06:41 +02:00
Thomas Becker
a4018d3484
merge with jetty-9
2012-08-02 15:00:43 +02:00
Thomas Becker
4e94601619
jetty-9: Make WriteFlusher threadsafe.
2012-08-02 14:38:54 +02:00
Greg Wilkins
0865a9cfb0
jetty-9 removed more AsyncConnection names
2012-08-02 18:10:29 +10:00
Greg Wilkins
b52930be14
jetty-9 merged Async and non-Async classes for EndPoint and Connection
2012-08-02 16:08:49 +10:00
Greg Wilkins
96b5c05674
jetty-9 one connector passing most tests
2012-08-02 11:51:54 +10:00
Greg Wilkins
2a470631bf
Merge branch 'jetty-9' into jetty-9-oneconnector
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java
2012-08-02 08:11:12 +10:00
Greg Wilkins
b2a8fc02dc
jetty-9 renaming and javadoc to improve the understandability of SslConnection
2012-08-01 15:53:03 +10:00
Simone Bordet
9a34c08b8e
Jetty9 - Removed unused fields.
2012-07-31 16:23:43 +02:00
Thomas Becker
a480e2c94d
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into writeFlusher_refactoring
2012-07-31 13:55:13 +02:00
Thomas Becker
377065fae7
interims changes
2012-07-31 13:51:19 +02:00
Greg Wilkins
50ac775bf5
jetty-9 added WriteFlusherTest
2012-07-31 19:07:25 +10:00
Greg Wilkins
acdc1c1abd
jetty-9 explain the sslConnection flush contract
2012-07-31 18:12:40 +10:00
Greg Wilkins
01529ba128
jetty-9 ignore all selector exceptions if not running, since closed selector exception is not an IOException
2012-07-31 14:55:06 +10:00
Greg Wilkins
e772e26b5b
jetty-9 synchronized writeflusher until correct non blocking impl
2012-07-31 14:54:22 +10:00
Simone Bordet
35b61feae2
Jetty9 - Test for better handling for I/O interests.
2012-07-30 23:02:25 +02:00
Simone Bordet
0c1ca16e86
Jetty9 - Better handling for I/O interests.
...
When the SelectChannelEndPoint is selected, it should only remove interests
for what has been selected, so that other interests are kept unchanged.
2012-07-30 19:43:13 +02:00
Simone Bordet
aa24693870
Jetty9 - Cleaned up and made test more reliable.
2012-07-30 19:39:20 +02:00
Simone Bordet
929defa465
Jetty9 - Removed assert with side effect.
2012-07-30 19:39:20 +02:00
Simone Bordet
c229915444
Jetty9 - Fixed idle timeout expiration, that was not firing if the idle timeout left was zero.
...
Added logging for idle timeout methods.
2012-07-30 12:44:48 +02:00
Simone Bordet
fa721bf510
Jetty9 - Making sure that we call EndPoint.close(), and therefore triggering the EndPoint
...
lifecycle callbacks, for exception cases and when the correspondent key is invalid.
2012-07-29 18:03:09 +02:00
Simone Bordet
0af40c4db2
Jetty9 - Added lifecycle callbacks for onOpen() for the application AsyncConnection linked to the SslConnection.
2012-07-29 14:57:29 +02:00
Greg Wilkins
039499d610
Merge branch 'jetty-9' into jetty-9-oneconnector
2012-07-28 08:26:00 +10:00
Simone Bordet
12a3333632
Jetty9 - Better implementation for onOpen().
...
Removed the set of the clientMode, since this needs to be set by the creator of the SslConnection,
depending whether is a client or a server.
Also, always calling super.onOpen() to call fillInterested(), even on client side, because it will need
to read the server SSL handshake.
Finally, removed the delegated call to onOpen() to the application connection. This is already done
by the creator of the application connection.
2012-07-27 23:31:34 +02:00
Simone Bordet
592cb3432e
Jetty9 - Introduced NextProtoNego AsyncConnections to handle SSL with NPN.
2012-07-27 21:54:09 +02:00
Simone Bordet
b79bfcac74
Jetty9 - Improved connection callbacks.
2012-07-27 15:14:04 +02:00
Simone Bordet
71cf945183
Improved logging.
2012-07-27 15:14:04 +02:00
Simone Bordet
b755762ea6
Jetty9 - Resetting OP_CONNECT interest after successful connect to avoid spin looping the selector thread.
2012-07-27 15:14:04 +02:00
Greg Wilkins
7bee81fa82
jetty-9 factoring out HTTP dependencies from connectors
2012-07-27 20:37:42 +10:00
Simone Bordet
822abe514e
Jetty9 - Improved idle timeout handling.
...
Idle timeouts are not enforced anymore by polling the AsyncEndPoints from the SelectorManager,
but instead the AsyncEndPoints now take a SchedulerExecutorService as parameter and perform
their own enforcing of the idle timeout.
Also removed a few Timer usages (replaced by SchedulerExecutorService) and fixed XML files
referencing old APIs.
2012-07-24 10:38:28 +02:00
Jesse McConnell
100b5fb6cb
move @Name to annotation package and change @Managed to drop PARAMETER
2012-07-23 09:44:41 -05:00
Simone Bordet
d2a0cb5c50
Jetty9 - Fixed compilation problems.
2012-07-23 15:38:27 +02:00
Simone Bordet
6b4583b461
Jetty9 - Introduced a onReadTimeout() callback and refactored into AbstractAsyncConnection.onOpen() calls to onFillInterested() that were previously done by all subclasses.
2012-07-23 14:27:33 +02:00
Greg Wilkins
5b57573596
jetty-9 scheduledexecutorservice
2012-07-23 19:20:29 +10:00
Greg Wilkins
ab298e511e
jetty-9 unit test cleanups
2012-07-23 17:11:59 +10:00
Greg Wilkins
8101b67ce8
jetty-9 lots of code cleanups from findbugs, warnings and TODOs
2012-07-23 14:08:35 +10:00
Simone Bordet
b08bca2abb
Jetty9 - Test fixing.
2012-07-20 16:13:27 +02:00
Simone Bordet
851239ee56
Jetty9 - More refactorings and renamings.
2012-07-20 15:23:39 +02:00
Simone Bordet
6aba6d1e8c
Jetty9 - Refactored SelectorManager and SelectChannelEndPoint.
...
Simplified Selectable interface, and improved idle timeout checking.
2012-07-20 13:04:28 +02:00
Greg Wilkins
b1750c0aae
jetty-9 fixed bad merge of poms
2012-07-20 15:20:57 +10:00
Greg Wilkins
0e896d4204
jetty-9 cleanups and fixes after merge
2012-07-20 14:58:32 +10:00
Greg Wilkins
bc2b770c6b
jetty-9 Cleaned up onOpen/onClose
...
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
2012-07-20 14:53:18 +10:00
Greg Wilkins
154a926b1b
jetty-9 merge from jetty-8. Mostly compiling but some tests still failing.
...
Merge remote-tracking branch 'origin/jetty-8' into jetty-9
Conflicts:
example-async-rest/async-rest-jar/pom.xml
example-async-rest/async-rest-webapp/pom.xml
example-async-rest/pom.xml
example-jetty-embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-all/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-http/src/main/java/org/eclipse/jetty/http/gzip/CompressedResponseWrapper.java
jetty-http/src/main/java/org/eclipse/jetty/http/gzip/GzipStream.java
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorClientTest.java
jetty-io/pom.xml
jetty-io/src/main/java/org/eclipse/jetty/io/AbstractBuffers.java
jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java
jetty-io/src/main/java/org/eclipse/jetty/io/AsyncEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/Buffer.java
jetty-io/src/main/java/org/eclipse/jetty/io/BuffersFactory.java
jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayBuffer.java
jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/ConnectedEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/Connection.java
jetty-io/src/main/java/org/eclipse/jetty/io/PooledBuffers.java
jetty-io/src/main/java/org/eclipse/jetty/io/bio/StreamEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/bio/StringEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java
jetty-io/src/test/java/org/eclipse/jetty/io/ChannelEndPointTest.java
jetty-io/src/test/java/org/eclipse/jetty/io/bio/SocketEndPointTest.java
jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointSslTest.java
jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointTest.java
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-monitor/pom.xml
jetty-nested/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java
jetty-rewrite/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/AsyncHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/GzipHandler.java
jetty-server/src/main/java/org/eclipse/jetty/server/nio/SelectChannelConnector.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
jetty-server/src/test/java/org/eclipse/jetty/server/LocalAsyncContextTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/SuspendHandler.java
jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/session/SessionHandlerTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketServerTest.java
jetty-servlet/pom.xml
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
jetty-servlets/pom.xml
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/IncludableGzipFilterTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-spdy/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/CompressionDictionary.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/CompressionFactory.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Controller.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/ISession.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/IStream.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/IdleListener.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Promise.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/PushSynInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/SessionException.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardCompressionFactory.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StreamException.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ByteBufferDataInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/BytesDataInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/DataInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/GoAwayInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Headers.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/HeadersInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/PingInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ReplyInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/RstInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDY.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDYException.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Session.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SessionFrameListener.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SessionStatus.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Settings.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SettingsInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Stream.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StreamFrameListener.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StreamStatus.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StringDataInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SynInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/server/ServerSessionFrameListener.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrameType.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/DataFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/GoAwayFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/HeadersFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/NoOpFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/PingFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/RstStreamFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SettingsFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynReplyFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynStreamFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/WindowUpdateFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/ControlFrameGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/DataFrameGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/Generator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/GoAwayGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/NoOpGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/PingGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/RstStreamGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SettingsGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynReplyGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynStreamGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/WindowUpdateGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/DataFrameParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/GoAwayBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/NoOpBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/Parser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/PingBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/RstStreamBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SettingsBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynReplyBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynStreamBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/UnknownControlFrameBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/WindowUpdateBodyParser.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/AsyncTimeoutTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardSessionTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardStreamTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ClientUsageTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ServerUsageTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/DataGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/GoAwayGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/HeadersGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/NoOpGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/PingGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/RstStreamGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SettingsGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynReplyGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynStreamGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/TestSPDYParserListener.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/WindowUpdateGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/LiveChromiumRequestParserTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/ParseVersusCacheBenchmarkTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/UnknownControlFrameTest.java
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http-webapp/src/main/config/etc/jetty-spdy.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/HTTPSPDYServerConnector.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/PushStrategy.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ReferrerPushStrategy.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPAsyncConnectionFactory.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnectionFactory.java
jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/AbstractHTTPSPDYTest.java
jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ConcurrentStreamsTest.java
jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ProtocolNegotiationTest.java
jetty-spdy/spdy-jetty/pom.xml
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/AsyncConnectionFactory.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/EmptyAsyncConnection.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/EmptyAsyncEndPoint.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYAsyncConnection.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYClient.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYServerConnector.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/ServerSPDYAsyncConnectionFactory.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/AbstractTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ClosedStreamTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/FlowControlTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/GoAwayTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/HeadersTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/IdleTimeoutTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/PingTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ProtocolViolationsTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/PushStreamTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ResetStreamTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SPDYClientFactoryTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SPDYServerConnectorTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SSLEngineLeakTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SSLSynReplyTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SettingsTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SynDataReplyDataLoadTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SynReplyTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/UnsupportedVersionTest.java
jetty-start/pom.xml
jetty-util/pom.xml
jetty-util/src/main/java/org/eclipse/jetty/util/URIUtil.java
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/DeflateFrameExtension.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD00.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketHandler.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/SafariWebsocketDraft0Test.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/SafariD00.java
jetty-xml/pom.xml
jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-servlet/src/main/java/Jetty400Repro.java
test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/HttpTester.java
test-jetty-servlet/src/test/java/org/eclipse/jetty/testing/HttpTesterTest.java
test-jetty-webapp/pom.xml
tests/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2012-07-20 11:07:57 +10:00
Simone Bordet
dfeb761306
Jetty9 - Now calling SelectorManager.newConnection() from a single call site rather than having to duplicate the call in every newEndPoint() implementation.
2012-07-19 18:43:23 +02:00
Jan Bartel
3c6a6fa8e0
383304 Reset PrintWriter on response recycle
...
Backout changes based on jdk1.6 method and replace by nulling out AbstractHttpConnection._writer object.
2012-07-19 20:14:41 +10:00
Jan Bartel
999f66b6a8
383304 PrintWriter error flag not recycled
2012-07-19 15:32:33 +10:00
Joakim Erdfelt
1c51e82b87
Forcefully making jetty-io compile (and letting sbordet fix it later)
2012-07-18 12:07:40 -07:00
Joakim Erdfelt
964fa9325a
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-18 11:51:38 -07:00
Simone Bordet
ebb7806edc
Jetty9 - Implemented abstract methods on SelectorManager that were always implemented in the same way, making them consistent.
2012-07-18 19:47:10 +02:00
Joakim Erdfelt
f1d4d4699f
Moving tests into jetty-util/src/test/java/org/eclipse/jetty/util/BufferUtilTest.java
2012-07-18 10:32:07 -07:00
Jesse McConnell
136514948f
[maven-release-plugin] prepare for next development iteration
2012-07-16 13:24:49 -05:00
Jesse McConnell
1bbc677a09
[maven-release-plugin] prepare release jetty-8.1.5.v20120716
2012-07-16 13:24:42 -05:00
Jesse McConnell
f755d014cd
[maven-release-plugin] prepare for next development iteration
2012-07-16 13:23:59 -05:00
Jesse McConnell
04b7e807a0
[maven-release-plugin] prepare release jetty-7.6.5.v20120716
2012-07-16 13:23:53 -05:00
Jesse McConnell
c00bb2d6ca
reset for release
2012-07-16 12:55:22 -05:00
Jesse McConnell
f59b2a0632
reset release
2012-07-16 12:54:36 -05:00
Jesse McConnell
205e8f74f0
[maven-release-plugin] prepare for next development iteration
2012-07-13 10:20:48 -05:00
Jesse McConnell
c3b5269d60
[maven-release-plugin] prepare release jetty-8.1.5.v20120713
2012-07-13 10:20:23 -05:00
Jesse McConnell
12ecc10c6a
[maven-release-plugin] prepare for next development iteration
2012-07-13 09:35:08 -05:00
Jesse McConnell
bf40110fb8
[maven-release-plugin] prepare release jetty-7.6.5.v20120713
2012-07-13 09:34:52 -05:00
Jesse McConnell
81d72052c8
merged master to jetty-8
2012-07-11 14:04:49 -05:00
Jesse McConnell
aa941f5711
quick pass through to clean up missing or incorrect license blocks
2012-07-11 12:29:46 -05:00
Jesse McConnell
0fa17c13b1
Merge branch 'master' into jetty-8
2012-07-11 10:10:00 -05:00
Jesse McConnell
5aeca2a138
added missing headers for io classes
2012-07-10 17:28:53 -05:00
Greg Wilkins
88d92f584b
384254 revert change to writable when not dispatched
2012-07-05 12:38:42 +02:00
Greg Wilkins
1676031906
jetty-9 ssl cleanups
2012-06-07 23:56:16 +02:00
Greg Wilkins
ad689a6a57
jetty-9 more renaming and signature tuning
2012-06-07 17:17:37 +02:00
Simone Bordet
2d6a45bf81
Fixed handling of callbacks in case of nested EndPoints.
...
In the SSL case, the app is writing, and eventually a SCEP.write() is triggered.
If this call throws, the SCEP callback is failed, and this in turn should fail the
app callback, but at this point the app callback was not set yet in the app
flusher, causing a NPE.
2012-06-07 14:02:29 +02:00
Simone Bordet
ec4b987b4d
Improved logging.
2012-06-07 13:42:49 +02:00
Greg Wilkins
3f80ec2bc2
jetty-9 lots of renaming
2012-06-06 21:35:51 +02:00
Greg Wilkins
f6643ccbe7
jetty-9 WriteFlusher cleanup
2012-06-06 16:49:27 +02:00
Greg Wilkins
903e4cd0f2
jetty-9 many name and javadoc cleanups
2012-06-06 16:40:19 +02:00
Greg Wilkins
98a7f19ff9
jetty-9 some test clean ups
2012-06-06 13:27:56 +02:00
Greg Wilkins
5415517cc0
jetty-9 organize imports
2012-06-05 14:06:18 +02:00
Greg Wilkins
96cbd53c47
jetty-9 jetty-server passing tests
2012-06-04 17:27:46 +02:00
Greg Wilkins
b2a55556b0
jetty-9 sbordet more tests
2012-06-01 00:32:09 +02:00
Greg Wilkins
583e99461c
jetty-9 sbordet inspired ssl cleanups
2012-05-31 17:46:45 +02:00
Greg Wilkins
887e27531f
jetty-9 new simple SslConnection - passing tests even with stress
2012-05-31 15:15:07 +02:00
Greg Wilkins
b9e28ba51e
jetty-9 new simple SslConnection - passing tests
2012-05-31 13:39:57 +02:00
Greg Wilkins
b8e2c65fa8
jetty-9 new simple SslConnection - still with problems
2012-05-31 11:48:47 +02:00
Greg Wilkins
117d7e5ad8
jetty-9 new simple SslConnection (comments)
2012-05-31 01:07:29 +02:00
Greg Wilkins
80ff0586a8
jetty-9 new simple SslConnection (mostly working)
2012-05-31 00:53:25 +02:00
Greg Wilkins
145938cecc
jetty-9 updated more test harness
2012-05-28 09:32:12 +02:00
Greg Wilkins
a0dae20ac0
jetty-9 \o/ first suspend resume cycles on jetty-9
2012-05-25 11:33:04 +02:00
Jesse McConnell
30e8e40ef2
[maven-release-plugin] prepare for next development iteration
2012-05-24 15:41:45 -05:00
Jesse McConnell
667cf9a643
[maven-release-plugin] prepare release jetty-8.1.4.v20120524
2012-05-24 15:41:38 -05:00
Jesse McConnell
d23a3c90b5
[maven-release-plugin] prepare for next development iteration
2012-05-24 15:40:47 -05:00
Jesse McConnell
57c73283d8
[maven-release-plugin] prepare release jetty-7.6.4.v20120524
2012-05-24 15:40:35 -05:00
Jesse McConnell
e528bc3cda
Merge branch 'jetty-8' into release-8
2012-05-24 15:13:07 -05:00
Jesse McConnell
55e268351e
Merge branch 'master' into release
2012-05-24 15:12:53 -05:00
Jesse McConnell
ae65cf6b5e
Merge branch 'master' into jetty-8
2012-05-24 15:12:15 -05:00
Greg Wilkins
0789690cea
jetty-9 horrid hack to make onClose events work
2012-05-24 22:00:45 +02:00
Greg Wilkins
c7979d399a
379046 idle close dispatched to own thread and deregistered from further idle calls
2012-05-24 21:57:30 +02:00
Jesse McConnell
e45a89694a
[maven-release-plugin] prepare for next development iteration
2012-05-24 09:30:58 -05:00
Jesse McConnell
36fc6fe890
[maven-release-plugin] prepare release jetty-8.1.4.v20120524
2012-05-24 09:30:52 -05:00
Jesse McConnell
035e16aedc
[maven-release-plugin] prepare for next development iteration
2012-05-24 09:27:27 -05:00
Jesse McConnell
f8c629026d
[maven-release-plugin] prepare release jetty-7.6.4.v20120524
2012-05-24 09:27:21 -05:00
Jesse McConnell
cf214ffeef
Merge branch 'master' into jetty-8
2012-05-24 08:35:22 -05:00
Jesse McConnell
c7a9adaa32
reset for release
2012-05-24 08:33:44 -05:00
Jesse McConnell
c8fe38733f
reset versions for release
2012-05-24 08:30:26 -05:00
Greg Wilkins
d80be96e41
379046 avoid closing idle connections from selector thread
2012-05-24 13:20:44 +02:00
Greg Wilkins
4473572b6d
jetty-9 more progress with RFC2616 tests
2012-05-23 18:04:50 +02:00
Jesse McConnell
ea176f0586
[maven-release-plugin] prepare for next development iteration
2012-05-22 15:14:05 -05:00
Jesse McConnell
3fdda881d8
[maven-release-plugin] prepare release jetty-8.1.4.v20120522
2012-05-22 15:13:56 -05:00
Jesse McConnell
300a37319a
[maven-release-plugin] prepare for next development iteration
2012-05-22 14:34:10 -05:00
Jesse McConnell
9ccd059375
[maven-release-plugin] prepare release jetty-7.6.4.v20120522
2012-05-22 14:33:59 -05:00
Greg Wilkins
40ed3a013a
jetty-9 some progress on HTTP error handling but more work needed. See SelectChannelServerTest
2012-05-18 13:12:38 +02:00
Greg Wilkins
6502370426
jetty-9 continue clean up of HttpConnector. Removed idle check
2012-05-17 14:14:56 +02:00
Greg Wilkins
68f8e073db
jetty-9 progress on unit tests and LocalConnector
2012-05-14 19:58:09 +02:00
Greg Wilkins
fcfb5d704a
jetty-9 AsyncByteArrayEndPoint test
2012-05-14 10:58:45 +02:00
Simone Bordet
4b8f6b8413
jetty-9 SelectorManager refactorings.
2012-05-11 19:30:30 +02:00
Simone Bordet
9e8b2f1aad
SSL refactorings.
2012-05-11 10:19:47 +02:00
Greg Wilkins
7f291e8831
jetty-9 AsyncByteArrayEndPointTest
2012-05-11 00:30:45 +02:00
Greg Wilkins
bd00e3615d
jetty-9 AsyncByteArrayEndPointTest
2012-05-11 00:30:28 +02:00
Greg Wilkins
6d70fa1c2a
jetty-9 factored out WriteFlusher and ReadInterest
2012-05-10 16:53:56 +02:00
Greg Wilkins
e348f2d4f5
jetty-9 progress on jetty-server
2012-05-10 12:19:16 +02:00
Greg Wilkins
979dae0021
jetty-9 moved FutureCallback to jetty-util
2012-05-09 18:27:09 +02:00
Greg Wilkins
817b9ee5fa
jetty-9 everything but SSL working again
2012-05-09 17:02:38 +02:00
Greg Wilkins
4caced258f
jetty-9 removed IOFuture and added FutureCallback instead
2012-05-09 16:57:18 +02:00
Greg Wilkins
775376ac98
jetty-9 refactored stats
2012-05-09 14:34:10 +02:00
Greg Wilkins
a7154fcb05
jetty-9 work in progress
2012-05-09 13:30:27 +02:00
Greg Wilkins
2b9ff87e02
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/AsyncConnection.java
2012-05-09 11:19:52 +02:00
Greg Wilkins
c1011c54a4
jetty-9 work in progress
2012-05-09 11:18:20 +02:00
Simone Bordet
44d2735a21
Changes to jetty-io related to integration with jetty-spdy.
2012-05-09 11:15:07 +02:00
Greg Wilkins
0c81b36e04
jetty-9 work in progress on jetty-server
2012-05-09 08:30:09 +02:00
Greg Wilkins
fa59ddcc4b
jetty-9 switched back to normal synchronization
2012-05-08 20:09:02 +02:00
Greg Wilkins
bc7e42e31f
jetty-9 more robust test
2012-05-08 19:44:35 +02:00
Simone Bordet
3c066d7a58
Fixed merging issues.
2012-05-08 19:00:40 +02:00
Simone Bordet
2b26d2f3ee
Refactorings.
2012-05-08 19:00:40 +02:00
Greg Wilkins
98e85ecb41
jetty-9 EndPoint.close does not throw
2012-05-08 15:46:41 +02:00
Greg Wilkins
6d64bcd38a
jetty-9 more removal of AsyncConnection
2012-05-08 15:30:32 +02:00
Greg Wilkins
dc02390449
jetty-9 some findbug cleanups
2012-05-08 14:09:50 +02:00
Greg Wilkins
7e8a627b92
jetty-9 removed AsyncConnection interface
2012-05-08 14:02:32 +02:00
Jan Bartel
2131a40559
Merge remote-tracking branch 'origin/master' into jetty-8
2012-05-07 13:54:30 +02:00
Greg Wilkins
2b78e69ac9
jetty-9 work in progress
2012-05-07 13:37:23 +02:00
Greg Wilkins
6cefe6c8f7
jetty-9 do not recycle IOFutures
2012-05-04 21:41:27 +02:00
Greg Wilkins
9a5f86188e
jetty-9 slow progress on SSL robustness
2012-05-04 19:10:24 +02:00
Greg Wilkins
6e62ab9bbe
jetty-9 slow progress on SSL robustness
2012-05-04 17:59:32 +02:00
Greg Wilkins
ad108c42c9
jetty-9 refactored common IOFuture pattern
2012-05-04 08:52:27 +02:00
Greg Wilkins
a1d8c640ce
jetty-9 removed onInputShutdown
2012-05-03 22:11:58 +02:00
Greg Wilkins
017d6e7c2a
jetty-9 cleanups
2012-05-03 21:41:54 +02:00
Greg Wilkins
f0eded5fdb
jetty-9 tests for ByteArrayEndPoint
2012-05-03 18:07:53 +02:00
Greg Wilkins
5e18ff7278
jetty-9 working on ByteArrayEndPoint
2012-05-03 15:17:34 +02:00
Greg Wilkins
60f9d7faff
jetty-9 working on ByteArrayEndPoint
2012-05-03 15:17:23 +02:00
Greg Wilkins
6a5fdefa07
jetty-9 added IOFuture test
2012-05-03 09:52:56 +02:00
Greg Wilkins
8f8c3f7760
jetty-9 ssl tests pass
2012-05-03 07:48:01 +02:00
Greg Wilkins
ba4157d8e6
jetty-9 more ssl progress.
2012-05-03 07:29:22 +02:00
Greg Wilkins
c61497327a
jetty-9 new jetty-io NIO.2 inspired design, mostly working but more work needed on SSL
2012-05-02 17:22:55 +02:00
Thomas Becker
011ae1f447
377587: UnitTest for ConnectHandler.write() with partial writes and non full buffer.
...
Change-Id: I8a8a3d57cba7a9c3502d1b6af6ff6eb5ac4e4ef5
377587: UnitTest for ConnectHandler.write() with partial writes and non full buffer.
Change-Id: I8d104d54de55e22325d14e69b474b245fe9d126c
2012-04-27 11:13:44 +02:00
Greg Wilkins
c7f25b0928
jetty-9 work in progress
2012-04-26 10:03:21 +10:00
Greg Wilkins
5e83df20c8
various sonar/findbug code cleanups
2012-04-25 00:00:54 +10:00
Jesse McConnell
b64909900c
[maven-release-plugin] prepare for next development iteration
2012-04-13 15:31:47 -05:00
Jesse McConnell
2c0a35d430
[maven-release-plugin] prepare release jetty-8.1.3.v20120413
2012-04-13 15:31:38 -05:00
Jesse McConnell
b963840d40
[maven-release-plugin] prepare for next development iteration
2012-04-13 15:29:14 -05:00
Jesse McConnell
a652ee7396
[maven-release-plugin] prepare release jetty-7.6.3.v20120413
2012-04-13 15:29:05 -05:00
Simone Bordet
72040202d4
Reverted release back to 8.1.3-SNAPSHOT.
2012-04-13 17:27:37 +02:00
Simone Bordet
85710fb9ea
Reverted release back to 7.6.3-SNAPSHOT.
2012-04-13 16:59:06 +02:00
Jesse McConnell
3b87e91cbe
[maven-release-plugin] prepare for next development iteration
2012-04-12 10:29:30 -05:00
Jesse McConnell
308b010744
[maven-release-plugin] prepare release jetty-8.1.3.v20120412
2012-04-12 10:29:20 -05:00
Jesse McConnell
cdcc0922c3
[maven-release-plugin] prepare for next development iteration
2012-04-12 09:49:52 -05:00
Jesse McConnell
5966c86571
[maven-release-plugin] prepare release jetty-7.6.3.v20120412
2012-04-12 09:49:46 -05:00
Greg Wilkins
b5e9de1cd8
Merge remote-tracking branch 'origin/master' into jetty-8
2012-04-12 17:16:22 +10:00
Greg Wilkins
a565c72adb
374550: remove printStackTrace calls
2012-04-12 16:51:59 +10:00
Greg Wilkins
737db225e3
jetty-9 progress on SslConnection tests
2012-04-05 23:17:30 +10:00
Greg Wilkins
e7dcd16757
jetty-9 Simplified interface
2012-04-04 14:00:16 +10:00
Greg Wilkins
dfab993fcb
jetty-9 SSL partially working
2012-04-04 13:47:46 +10:00
Jan Bartel
17269583fb
Merge remote-tracking branch 'origin/master' into jetty-8
2012-03-30 12:05:46 +11:00
Greg Wilkins
c60ec9cf5f
jetty-9: work in progress on read/write interest
2012-03-29 22:49:08 +11:00
Greg Wilkins
b267511f8f
jetty-9 sketched out httpchannel blocking read
2012-03-28 23:31:39 +11:00
Greg Wilkins
2bcf611e5e
jetty-9 work in progress. Further simplification of jetty-io
2012-03-27 00:19:43 +11:00
Greg Wilkins
e77f4344ac
jetty-9 work in progress on HttpConnection to HttpChannel split
2012-03-23 16:29:38 +11:00
Greg Wilkins
65725b0025
357318: make the cancel key work around conditional on running on windows
2012-03-23 09:21:00 +11:00
Greg Wilkins
d8b1d80e4e
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
2012-03-19 17:22:02 +11:00
Greg Wilkins
7e3b8bcfd4
374611: do not redispatch if already dispatched when SSL reads content on write
2012-03-19 15:48:39 +11:00
Greg Wilkins
7842e9c101
374450: use temp read only buffers instead of synchronisation
2012-03-16 10:05:38 +11:00
Greg Wilkins
a6eda90594
fixed merge issue
2012-03-16 09:16:46 +11:00
Simone Bordet
fef74963af
Forgotten modifications from Jetty7
2012-03-14 19:39:21 +01:00
Simone Bordet
5624a5721e
Merged from master.
2012-03-14 18:24:57 +01:00
Simone Bordet
2e2247bde5
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-03-14 16:32:03 +01:00
Simone Bordet
4a02fdb6c0
374252 - SslConnection.onClose() does not forward to nested connection.
2012-03-14 16:12:46 +01:00
Greg Wilkins
708f8ccaeb
374158: do not asyncDispatch from SSL if suspended
2012-03-14 11:48:06 +11:00
Greg Wilkins
10cc4ca498
jetty-9 refactored jetty-http to support injected state
2012-03-13 13:35:48 +11:00
Jesse McConnell
b4985ad0d5
[maven-release-plugin] prepare for next development iteration
2012-03-08 23:53:50 -06:00
Jesse McConnell
7a99af4ffe
[maven-release-plugin] prepare release jetty-8.1.2.v20120308
2012-03-08 23:53:42 -06:00
Jesse McConnell
246e3ed756
[maven-release-plugin] prepare for next development iteration
2012-03-08 21:09:46 -06:00
Jesse McConnell
a63b3fdc5e
[maven-release-plugin] prepare release jetty-7.6.2.v20120308
2012-03-08 21:09:37 -06:00
Greg Wilkins
03525bfe46
jetty-9 javadoc and code cleanups
2012-03-08 15:18:17 +11:00
Jesse McConnell
381615f52d
merge from master
2012-03-07 16:44:31 -06:00
Jesse McConnell
50d92ec8ef
reset versions
2012-03-06 17:07:53 -06:00
Jesse McConnell
f12e3c390c
reset versions
2012-03-06 17:06:10 -06:00
Thomas Becker
ff75d9e38a
373394: fix for IllegalArgumentException in SelectChannelEndpoint.blockWritable() when wait is called with a negative value.
2012-03-06 21:26:46 +01:00
Simone Bordet
ffdcfa5dde
Avoid reading field twice (may lead to spurious NPEs).
2012-03-06 18:09:58 +01:00
Jesse McConnell
54493cd80d
Merge "373246: IOTest.testReset uses dynamic port now instead of static hard coded one"
2012-03-05 09:18:08 -05:00
Thomas Becker
0adec36c29
373246: IOTest.testReset uses dynamic port now instead of static hard coded one
...
Change-Id: I9b254937fa02ba745832bf1b5c99069bea641bbd
2012-03-05 15:15:23 +01:00
Jesse McConnell
d1c8c477ea
[maven-release-plugin] prepare for next development iteration
2012-03-02 08:57:43 -06:00
Jesse McConnell
b75868e84f
[maven-release-plugin] prepare release jetty-8.1.2.v20120302
2012-03-02 08:57:19 -06:00
Jesse McConnell
51311d050e
[maven-release-plugin] prepare for next development iteration
2012-03-02 08:37:46 -06:00
Jesse McConnell
a8296ec3d5
[maven-release-plugin] prepare release jetty-7.6.2.v20120302
2012-03-02 08:37:38 -06:00
Greg Wilkins
a4bee5b12d
jetty-9 work in progress on new HttpGenerator
2012-03-02 11:39:42 +11:00
Jan Bartel
959a4a2743
Merge remote-tracking branch 'origin/master' into jetty-8
2012-03-02 10:39:17 +11:00
Greg Wilkins
79ce93ba94
357318: cancel key before close as speculative work around for JVM bug
2012-03-02 08:07:16 +11:00
Jan Bartel
c7b42cdb06
Merge remote-tracking branch 'origin/master' into jetty-8
2012-02-29 20:07:33 +11:00
Simone Bordet
556ff1a2c6
372457 - Big response + slow clients + pipelined requests cause Jetty spinning and eventually closing connections.
...
Added a TODO for a method renaming that will happen in the next major release (to avoid break implementers).
2012-02-28 09:21:52 +01:00
Jesse McConnell
ac79497dee
[maven-release-plugin] prepare for next development iteration
2012-02-15 14:29:36 -06:00
Jesse McConnell
3705b424c8
[maven-release-plugin] prepare release jetty-8.1.1.v20120215
2012-02-15 14:29:28 -06:00
Jesse McConnell
efb6883cf0
[maven-release-plugin] prepare for next development iteration
2012-02-15 14:22:19 -06:00
Jesse McConnell
baf2b94f77
[maven-release-plugin] prepare release jetty-7.6.1.v20120215
2012-02-15 14:22:12 -06:00
Greg Wilkins
9c1d3ff0b3
jetty-9 temporary tree map impl
2012-02-09 18:02:51 +11:00
Greg Wilkins
60bb4a415e
jetty-9 used enums instead of cached strings. Refactor of parser in progress to IO independent style. passes 1 test
2012-02-09 01:37:03 +11:00
Greg Wilkins
7ba514e250
jetty-9 fixed SSL issue. _inbound needed to be compacted
2012-02-07 15:27:15 +11:00
Greg Wilkins
c1bcec61d5
jetty-9 jetty-io mostly working with all NIO buffers. Occassional failure in SSL stress test
2012-02-07 11:32:00 +11:00
Jesse McConnell
6b079ae3d8
merge from master
2012-02-01 17:25:08 -06:00
Greg Wilkins
2197854308
369121 simplified test
2012-01-31 15:35:35 +11:00
Jesse McConnell
6e44f4db5f
[maven-release-plugin] prepare for next development iteration
2012-01-27 08:15:45 -06:00
Jesse McConnell
9d1ca3593e
[maven-release-plugin] prepare release jetty-8.1.0.v20120127
2012-01-27 08:15:38 -06:00
Jesse McConnell
ad6126553b
[maven-release-plugin] prepare for next development iteration
2012-01-27 08:13:06 -06:00
Jesse McConnell
4e25f7bb05
[maven-release-plugin] prepare release jetty-7.6.0.v20120127
2012-01-27 08:13:00 -06:00
Jesse McConnell
f2d0fd3cc8
revert back to 8.1.0-SNAPSHOT
2012-01-26 10:45:06 -06:00
Jesse McConnell
7ac9eb585f
revert back to 7.6.0-SNAPSHOT
2012-01-26 10:42:11 -06:00
Jesse McConnell
e98ae91ca6
[maven-release-plugin] prepare for next development iteration
2012-01-25 11:16:11 -06:00
Jesse McConnell
fb30166a7f
[maven-release-plugin] prepare release jetty-8.1.0.v20120125
2012-01-25 11:16:05 -06:00
Jesse McConnell
c918bb4e3c
Merge branch 'master' into jetty-8
2012-01-25 10:31:44 -06:00
Jesse McConnell
0c96fc40ea
[maven-release-plugin] prepare for next development iteration
2012-01-25 09:31:06 -06:00
Jesse McConnell
b455b7d94e
[maven-release-plugin] prepare release jetty-7.6.0.v20120125
2012-01-25 09:30:55 -06:00
Greg Wilkins
f3735fab7b
368992 avoid update key while flushing during a write
2012-01-24 18:27:59 +11:00
Greg Wilkins
e1b12a633b
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-distribution/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
2012-01-20 13:00:32 +11:00
Greg Wilkins
02d53f9612
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-01-20 12:40:58 +11:00
Greg Wilkins
8e69edaf9e
368992 avoid non-blocking flush when writing to avoid setting !_writable without _writeblocked
2012-01-20 12:40:34 +11:00
Jesse McConnell
4fe85c9c1e
additional more informative test error messages
2012-01-19 13:42:07 -06:00
Jesse McConnell
8e262aca04
[369120] more descriptive test failure output
2012-01-19 11:26:17 -06:00
Greg Wilkins
7cd887d48b
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-01-19 12:40:07 +11:00
Greg Wilkins
f79bdfaf2e
368992 clear interest ops for double dispatch even if no read/write blocked threads
2012-01-19 12:39:45 +11:00
Simone Bordet
486af62635
Improved logging of exceptions; now stack traces are printed in debug mode, if the exception is rethrown.
2012-01-18 12:38:28 +01:00
Simone Bordet
f039d00910
Made SslConnection logger a per-instance variable, to avoid lock contention with other SslConnection instances.
2012-01-18 10:05:35 +01:00
Jan Bartel
98684397fd
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-18 14:17:41 +11:00
Greg Wilkins
9ff8633554
368821 SslConnection.handle always calls wrapped Connection.handle, so state can be processed
2012-01-18 13:39:24 +11:00
Simone Bordet
b57bf3b600
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-01-17 23:06:46 +01:00
Simone Bordet
6e38a97d7f
When dumping the selector, we should take the keys only once, otherwise the set of keys may change between calls.
2012-01-17 23:00:34 +01:00
Jesse McConnell
90184ab3c3
Latest merge from master
2012-01-17 13:36:44 -06:00
Greg Wilkins
1537433b81
368821 Only do SSL asyncDispatch for temp buffer fills
2012-01-17 23:59:12 +11:00
Greg Wilkins
ef9ac7760d
368635 moved lifecycle state reporting from toString to dump
2012-01-16 15:24:31 +11:00
Greg Wilkins
b8e0258faf
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java
2012-01-12 11:01:03 +11:00
Simone Bordet
d4f522b9d4
Corrected SslConnection to clear the _inbound buffer if the input is shutdown
...
and the unwrapping yielded a buffer underflow.
This is important because isInputShutdown() returns true only if the _inbound
buffer is empty, and the check for the input shutdown is made in several places.
Added also more SSL bytes tests that send RST in order to test cases that throw
exceptions.
2012-01-11 22:22:42 +01:00
Simone Bordet
5c059550a8
Improved logging.
2012-01-11 22:18:24 +01:00
Jan Bartel
691efcc7ca
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-11 16:35:57 +11:00
Simone Bordet
bb0a320102
Improved toString().
2012-01-10 17:41:32 +01:00
Greg Wilkins
8fcc22df32
368240: Improved handling of dispatch failure
2012-01-11 01:12:36 +11:00
Greg Wilkins
a7783ae568
368240: Fixed the start of dependent beans
2012-01-11 01:04:01 +11:00
Greg Wilkins
968a2ac95b
368240: Added concept of join to AggregateLifeCycle. Used by HttpClient and AbstractConnector
2012-01-11 00:09:34 +11:00
Jan Bartel
1fbec51c8a
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-10 16:08:59 +11:00
Jesse McConnell
0fa4fa9b23
clean up some warnings from maven
2012-01-09 14:57:21 -06:00
Greg Wilkins
bb2d782f3e
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-23 02:09:20 +11:00
Greg Wilkins
b4ab738ca9
364921 Made test less time sensitive for ssl
2011-12-23 00:57:26 +11:00
Greg Wilkins
b36425b7aa
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
2011-12-22 09:52:11 +11:00
Greg Wilkins
7b2a0cb502
364921 removed debug
2011-12-22 00:53:33 +11:00
Greg Wilkins
b99e03c465
364921 moved setCheckForIdle handling to AsyncHttpConnection
2011-12-22 00:48:25 +11:00
Jan Bartel
c3643d9937
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-21 12:37:23 +11:00
Greg Wilkins
a606529710
364921 SslConnection does real close on idle if already oshut
2011-12-21 10:06:55 +11:00
Simone Bordet
ecb88f836e
367175 - SSL 100% CPU spin in case of blocked write and RST.
2011-12-20 13:25:55 +01:00
Greg Wilkins
c5c6377e26
some IOTests to show that clients can write after server close???
2011-12-20 09:21:18 +11:00
Greg Wilkins
b027779830
364638 check for idle after shutdown output
2011-12-19 16:53:14 +11:00
Simone Bordet
3e05c1e59d
Merged from origin/master.
2011-12-16 21:30:45 +01:00
Simone Bordet
ed1ee997b4
Fixed missing call to handle() in case of non-dispatched reads.
...
While performing a SSL write triggered by an application thread that is not
dispatched by the NIO layer, process() may read and decrypt bytes that will
be kept in the _unwrapBuf buffer.
However, the application needs to parse these bytes, but parsing is normally
performed only from handle() by a thread dispatched by the NIO layer.
The fix is to detect if there are unparsed bytes at the end of process(), and if
so, call asyncDispatch() to eventually call handle() to parse those bytes.
2011-12-16 20:58:18 +01:00
Simone Bordet
a88e2c5ebb
Updated toString() implementations.
2011-12-16 20:53:15 +01:00
Jan Bartel
e515b5b7dc
JETTY-1460 suppress PrintWriter exceptions
2011-12-15 20:19:04 +11:00
Greg Wilkins
bc48eb1f5b
366730 pass the time idle to onIdleExpire
2011-12-14 11:41:32 -08:00
Simone Bordet
fa0e06d186
Removed guard whether the channel is closed in checkIdleTimestamp().
...
This follows commit ff29a1cc51
for JETTY-1322.
The reason to remove the guard is that the channel may be closed multiple times, and if for any reason
a check to the idle timestamp triggers, then the idle callback is invoked, but it's not really idle: it is
already closed.
When used with SSL, this causes a truncation attack exception thrown by SSLEngine, because the idle
callback causes a shutdown of the SSLEngine without having received a SSL close alert.
2011-12-13 11:14:25 +01:00
Simone Bordet
416b6a8a15
Added guard against multiple closes: if the endPoint is already closed, skip updating the SSLEngine and/or the endPoint.
2011-12-12 16:57:14 +01:00
Greg Wilkins
de005c68fd
Revert "Merge branch 'release-8'"
...
This reverts commit 9e72457941
, reversing
changes made to df12605f0e
.
2011-11-30 16:27:30 +11:00
Greg Wilkins
631b0ba1b6
[maven-release-plugin] prepare for next development iteration
2011-11-30 13:16:54 +11:00
Greg Wilkins
9d3745f999
[maven-release-plugin] prepare release jetty-8.1.0.RC0
2011-11-30 13:16:41 +11:00
Greg Wilkins
dcf7ef2335
fixes after merge
2011-11-29 10:15:20 +11:00
Greg Wilkins
55d5020980
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2011-11-29 09:06:25 +11:00
Greg Wilkins
4ce72ee549
improved test timing
2011-11-29 08:36:56 +11:00
Greg Wilkins
b969de1788
organized imports
2011-11-28 15:32:14 +11:00
Greg Wilkins
06b66f31f5
test NIO assumptions
2011-11-28 11:54:08 +11:00
Greg Wilkins
ddce35a2e6
364638 SCEP does idle timestamp checking. New setCheckForIdle method controls onIdleExpired callback.
...
364921 a second onIdleExpired callback will result in close rather than a shutdown output.
2011-11-28 11:51:01 +11:00
Simone Bordet
8e913fe7c0
Fixed bug in AsyncEndPoint.hasProgressed() handling: the progressing status
...
must be remembered until a call to hasProgressed() is made.
Additional code cleanups.
2011-11-24 20:58:59 +01:00
Simone Bordet
c6103f2d53
Removed usages of ThreadDeath.
2011-11-24 20:39:04 +01:00
Simone Bordet
59c111bde1
Rewritten toString() methods using String.format().
2011-11-24 15:20:06 +01:00
Simone Bordet
8f1fff78c0
Improved dumping capabilities of HttpClient, and rewritten toString() methods using String.format().
2011-11-24 10:16:19 +01:00
Greg Wilkins
aa0b71f928
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-11-22 13:16:40 +11:00
Greg Wilkins
6cb2d13abd
Client idle connection uses onIdleExpired rather than close
2011-11-22 12:57:32 +11:00
Simone Bordet
e1d05939b8
Merge remote-tracking branch 'origin/master'
2011-11-21 23:47:03 +01:00
Simone Bordet
83f2c1b55c
Integrated behavior of is[In|Out]putShutdown() with volatile flag and previous implementation.
2011-11-21 23:31:09 +01:00
Simone Bordet
e27c5a9306
Normalized behavior of shutdown[In|Out]put() methods and is[In|Out]putShutdown(), relying on a volatile flag.
2011-11-21 21:39:47 +01:00
Greg Wilkins
d55477388b
more debug in tests
2011-11-22 00:12:56 +11:00
Jan Bartel
0e9449ac85
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-21 18:18:09 +11:00
Greg Wilkins
a00f790bc5
fixed close on early shutdown
2011-11-21 10:25:26 +11:00
Greg Wilkins
dbd97a52ae
flush ssl shutdownoutput
2011-11-19 09:48:47 +11:00
Simone Bordet
712d250d3e
Merge remote-tracking branch 'origin/master'
2011-11-18 12:45:05 +01:00
Greg Wilkins
defc729d69
close idle SSL with shutdown
2011-11-18 15:33:05 +11:00
Greg Wilkins
f70ed3ac21
prevent spin by write blocked from non dispatched thread
2011-11-18 09:19:52 +11:00
Simone Bordet
324f2049f3
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-11-17 12:40:56 +01:00
Simone Bordet
d1592cf5b5
Added more SSL tests to detect spinning conditions.
2011-11-17 12:40:32 +01:00
Greg Wilkins
584bbd4bce
improved siege
2011-11-17 16:31:22 +11:00
Jan Bartel
b8b5df27d6
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 11:03:07 +11:00
Jan Bartel
127a5af8d7
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 10:59:54 +11:00
Greg Wilkins
e48570bd5e
SSL progress measured by process not inbound
2011-11-17 07:14:40 +11:00
Greg Wilkins
e322a28753
made test timing less sensitive to Virtual machine quantums
2011-11-16 17:54:35 +11:00
Greg Wilkins
ff656d4a17
less stressful test
2011-11-16 17:08:38 +11:00
Greg Wilkins
de42eafdcd
cleanup
2011-11-16 14:01:50 +11:00
Greg Wilkins
a9d33bb561
maintain own ishut status
2011-11-16 13:15:36 +11:00
Greg Wilkins
9ac9a1d687
maintain own ishut status
2011-11-16 13:12:19 +11:00
Greg Wilkins
a8173e3d12
test clean ups
2011-11-16 12:54:14 +11:00
Greg Wilkins
0fdc5c5d2e
test clean ups
2011-11-16 12:26:28 +11:00
Greg Wilkins
e3bdf43112
clean ups
2011-11-16 10:46:06 +11:00
Greg Wilkins
52275e27b4
reverted possible fix for OS that does not handle half close well
2011-11-16 10:22:49 +11:00
Greg Wilkins
533210298d
possible fix for OS that does not handle half close well
2011-11-16 09:58:45 +11:00
Greg Wilkins
400bdd1e9a
349110 fixed bypass chunk handling
2011-11-16 08:36:42 +11:00
Greg Wilkins
edbea0c613
363757 partial fix
2011-11-15 23:19:46 +11:00
Greg Wilkins
c9e08217d8
fixed read while suspended issue with double dispatch
2011-11-15 17:09:10 +11:00
Greg Wilkins
722f390800
numerous findbugs inspired cleanups
2011-11-15 11:22:35 +11:00
Greg Wilkins
62e669ffa9
moved hasProgressed handling to only be in SslConnection
2011-11-11 12:34:46 +11:00
Greg Wilkins
a62061944e
removed EndPoint.isBufferingInput
2011-11-11 11:41:29 +11:00
Simone Bordet
09999a629d
Removed EndPoint.isBufferingOutput().
2011-11-10 21:52:33 +01:00
Simone Bordet
34fbbd5e28
Made the test case more robust.
...
The call to EndPoint.blockReadable() must be enclosed in a while loop, since the EndPoint
may be woken up spuriously or by write readyness, and no further bytes may be read.
2011-11-10 15:31:56 +01:00
Greg Wilkins
921b285235
Avoid flush if no content to flush
2011-11-10 14:45:28 +11:00
Greg Wilkins
f37b617481
improved test failure message
2011-11-10 13:26:30 +11:00
Greg Wilkins
629b6360de
removed EndPoint.isBuffered
2011-11-10 13:15:41 +11:00
Greg Wilkins
144195d435
removed redundant setConnection
2011-11-10 12:47:50 +11:00
Greg Wilkins
7504d24e9e
Fixed SslConnection upgrade handling
2011-11-10 12:44:32 +11:00
Greg Wilkins
6e14902659
AsyncEndPoint is-a ConnectedEndPoint
2011-11-10 12:44:03 +11:00
Greg Wilkins
e3cf7a8898
improved ThreadDeath handling
2011-11-10 12:40:29 +11:00
Greg Wilkins
7a9b8f1e9d
reverted last changes due to instability
2011-11-10 12:11:58 +11:00
Greg Wilkins
d61258ec4e
clean ups from review from sbordet.
...
Removed isBufferred
fixed instanceof ThreadDeath
avoid race with onInputShutdown
2011-11-10 10:12:37 +11:00
Greg Wilkins
7e37d1a428
pool and compress the unwrap buffer
2011-11-10 00:19:54 +11:00
Greg Wilkins
32f7822c1a
Reverted the unwrapBuf to not be pooled.
2011-11-09 23:38:09 +11:00
Greg Wilkins
a95d2c11e2
removed debug
2011-11-09 17:41:10 +11:00
Greg Wilkins
af4c40d793
fixed SSL buffer pool
2011-11-09 17:39:59 +11:00
Greg Wilkins
a36342438c
cleaned up some unit tests
2011-11-09 17:03:11 +11:00
Greg Wilkins
470e63b77b
added SCEP stress test
2011-11-09 16:07:36 +11:00
Greg Wilkins
71734400e9
improved handling of RST
2011-11-09 15:07:47 +11:00
Jesse McConnell
2a6b8696d7
Merge branch 'master' into jetty-8
2011-11-08 15:59:55 -06:00
Joakim Erdfelt
4e89277210
Adjusting failing testcase to be more clear about failures
2011-11-08 14:26:34 -07:00
Joakim Erdfelt
3302d3fc60
Adjusting failing testcase to be more clear about failures
2011-11-08 14:25:10 -07:00
Greg Wilkins
5bf6f60396
copyright and comments
2011-11-09 08:13:29 +11:00
Greg Wilkins
66ea1e819a
fixed test to use localhost
2011-11-09 08:13:00 +11:00
Greg Wilkins
7a082280f1
Merge remote-tracking branch 'origin/master' into jetty-7.6
...
Conflicts:
example-jetty-embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-all/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
jetty-client/src/main/java/org/eclipse/jetty/client/SelectConnector.java
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-http/src/main/java/org/eclipse/jetty/http/ssl/SslContextFactory.java
jetty-io/pom.xml
jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp-2.1/pom.xml
jetty-monitor/pom.xml
jetty-nested/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-logback/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-rewrite/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-start/pom.xml
jetty-util/pom.xml
jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java
jetty-util/src/test/java/org/eclipse/jetty/util/log/NamedLogTest.java
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD13.java
jetty-xml/pom.xml
pom.xml
test-continuation-jetty6/pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-webapp/pom.xml
tests/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2011-11-07 18:09:31 +11:00
Greg Wilkins
202475aad9
clean build
2011-11-07 15:34:33 +11:00
Simone Bordet
f1251412e4
Modified behavior of shutdownInput() and shutdownOutput() to always shutdown either input or output.
...
Calling socket.close() does not imply that socket.isInputShutdown() returns true, so there was a
possibility that code was calling ChannelEndPoint.shutdownInput(), but the input was not really
shutdown, and a subsequent call to ChannelEndPoint.isInputShutdown() returned false.
2011-11-04 15:22:43 +01:00
Joakim Erdfelt
5f653aa87a
Minor tweak to SCEP.toString() to make it a bit more readable
2011-11-02 16:47:40 -07:00
Jesse McConnell
2b6fec713c
Merge branch 'master' into jetty-8
2011-11-02 16:47:04 -05:00
Greg Wilkins
afc358972a
360546 handle set count exceeding max integer
2011-10-28 15:04:49 +11:00
Greg Wilkins
5aac176fbd
some Async client tests passing
2011-10-28 11:38:41 +11:00
Greg Wilkins
738cbfdccc
refactored client to use upgradeable endpoint. Instert SslConnection when needed
2011-10-27 16:37:07 +11:00
Greg Wilkins
3dfd8b7698
jetty-server passing tests
2011-10-27 00:38:05 +11:00
Greg Wilkins
4258b6f385
SslConnection server side mostly working
2011-10-26 22:55:02 +11:00
Greg Wilkins
19ba79f4f1
work in progress
2011-10-26 10:47:00 +11:00
Greg Wilkins
010328fe2b
work in progress
2011-10-26 10:14:03 +11:00
Greg Wilkins
61664d3c0f
Added concept of SslConnection
2011-10-26 01:15:59 +11:00
Jesse McConnell
d5320d95ba
[maven-release-plugin] prepare for next development iteration
2011-10-24 15:02:30 -05:00
Jesse McConnell
d02f74a50c
[maven-release-plugin] prepare release jetty-8.0.4.v20111024
2011-10-24 15:02:23 -05:00
Jesse McConnell
1d86da8f68
[maven-release-plugin] prepare for next development iteration
2011-10-24 14:52:54 -05:00
Jesse McConnell
5f349ecc92
[maven-release-plugin] prepare release jetty-7.5.4.v20111024
2011-10-24 14:52:48 -05:00
Greg Wilkins
6a17c69bfb
Non SSL client working
2011-10-24 17:14:56 +11:00
Jan Bartel
fc497fe1e8
Merge remote-tracking branch 'origin/master' into jetty-8
2011-10-24 16:30:10 +11:00
Greg Wilkins
a642f7b55c
Merge remote-tracking branch 'origin/master' into jetty-7.6
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java
2011-10-24 11:27:42 +11:00
Greg Wilkins
5ee01184ac
reworked async client connection
2011-10-24 11:23:29 +11:00
Greg Wilkins
cd0628ab66
Added isDebugEnabled guards to debugging that generates garbage
2011-10-22 09:39:54 +11:00
Jan Bartel
0ba6fc7408
Merge remote-tracking branch 'origin/master' into jetty-8
2011-10-21 14:55:39 +11:00
Greg Wilkins
5140a95144
refactored HttpConnection name
2011-10-20 15:12:19 +11:00
Greg Wilkins
0e284f78f5
Protected HttpParser from multiple entry.
2011-10-20 12:18:10 +11:00
Greg Wilkins
75c4ec733d
Merge remote-tracking branch 'origin/master' into jetty-7.6
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
2011-10-20 10:01:36 +11:00
Greg Wilkins
1d00f786a5
reduce verbosity of closes
2011-10-19 23:34:21 +11:00
Greg Wilkins
d63577b4e9
361325 359292 Allow KeyStore to be set
2011-10-19 15:20:01 +11:00
Greg Wilkins
49f8b0de1a
Websocket partially refactored and passing tests
2011-10-18 21:59:49 +11:00
Greg Wilkins
6edb7c1930
organised imports
2011-10-18 15:05:22 +11:00
Greg Wilkins
e43b718fb1
Refactored NIO to better handle half closes. Applied the following policy:
...
Call shutdownOutput to signal the other end that you have written all the data that your are going to write (eg and the end of a non persistent HTTP response). This can be done either by generator (when it is complete) or coordinator or handle - but we need to decide which and have only 1 doing it.
Call shutdownInput to signal your own end that you have read -1 and to allow other local code to check that with an isInputShutdown. Ideally we could get by without any calls at all to shutdownInput, so long as we well handle reading -1 (Currently we don't). This should be done by whatever does the IO read.
Calling close should always be a real TCP close, even with SSL. SSL shutdown
The default handling of an idle callback should be close. But some connections (NOT endpoints) may implement idle as initiating a shutdown exchange (eg websocket close). If they do, this is state that should be held in the connection or parser - ie do-this-exhange-and-then-shutdown
Call close when you want to shutdown Output and you have already read -1, so input is already shutdown. We need to double verify that this is correct and that if a FIN has been received from the other end, that a close will not result in a reset. I'll do that today.
Call close when you want to shutdown Input and output has already been shutdown. This means you have read -1 after having sent a FIN.
Call close on any errors.
The current state is that server HttpConnection appears to be working well. Other connection types have not been updated and/or tested
2011-10-18 14:38:02 +11:00