Simone Bordet
2748a9381e
jetty-9: Added support for connect timeout.
2012-10-08 11:05:26 +02:00
Greg Wilkins
f4d12412eb
jetty-9 added FilterConnectionFactory and made SpdyServer use it
2012-10-08 15:22:49 +11:00
Greg Wilkins
c5d8fd748b
jetty-9 added FilterConnection
2012-10-07 09:09:23 +11:00
Greg Wilkins
97d08c399a
jetty-9 removed race with NPN replacing connection and extra wrap causing NPE in SSLEngineImpl
2012-10-02 15:00:31 -07:00
Greg Wilkins
6cc0734a1a
jetty-9 miscillaneous optimizations: donot dispatch to HTTP and SPDY; improved executorCallback
2012-10-02 13:48:51 -07:00
Greg Wilkins
cb4e7982b1
jetty-9 SslConnection fill does not try to send close handshake
2012-09-24 13:10:18 +10:00
Simone Bordet
9e7fcf4fee
jetty-9: Fixed SslBytesServerTest, and added factory methods to relevant classes.
2012-09-21 16:47:01 +02:00
Greg Wilkins
e04494da64
jetty-9 fixed test onOpen
2012-09-21 18:00:46 +10:00
Greg Wilkins
68ee346b8a
jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle
2012-09-21 11:45:51 +10:00
Greg Wilkins
b9ceb8703d
Merge branch 'jetty-9' into jetty-9-open-close
2012-09-21 08:36:22 +10:00
Joakim Erdfelt
857498b115
Upgrading to junit-dep-4.10.jar (banning junit.jar)
2012-09-20 11:52:59 -07:00
Simone Bordet
37a7e5977d
Merged branch 'jetty-9' into jetty-9-open-close.
2012-09-20 18:46:16 +02:00
Simone Bordet
40382bad3a
jetty-9 - Removed references to JUnit 3.x.
2012-09-20 18:23:02 +02:00
Greg Wilkins
0d2627b6e9
jetty-9 improved onOpen onclose handling
2012-09-20 11:05:20 +10:00
Simone Bordet
851de69d9d
jetty-9 - Third take at open/close refactoring.
2012-09-19 18:04:15 +02:00
Simone Bordet
44b3bb067c
jetty-9 - Second take at open/close refactoring.
2012-09-19 13:37:47 +02:00
Simone Bordet
f257f4b2bb
jetty-9 - First take at open/close refactoring.
2012-09-19 13:37:47 +02:00
Simone Bordet
0915b2b0ab
jetty-9 - Refactored code that was counting the number of reentrant invocations into a common utility class, ForkInvoker.
2012-09-17 14:39:13 +02:00
Simone Bordet
4ea5734ab1
jetty-9 - Avoiding StackOverflowErrors when processing changes.
2012-09-17 11:46:26 +02:00
Simone Bordet
4f1a2990de
jetty-9 - Always making SslConnection dispatch completion callbacks to avoid StackOverflowErrors.
2012-09-17 11:46:26 +02:00
Greg Wilkins
129583679a
jetty-9 javadoc improvements and renamed SelectChannelConnector to ServerConnector
2012-09-17 17:37:56 +10:00
Simone Bordet
4ffe66f899
jetty-9 - HTTP client: better cleanup at stop.
2012-09-14 23:30:21 +02:00
Simone Bordet
88cbfed7e0
jetty-9 - Made SelectorManager.connection[Opened|Closed]() concrete, since they are overridden only by SelectChannelConnector.
2012-09-14 23:30:21 +02:00
Simone Bordet
cf3f12297f
jetty-9 - Cosmetics.
2012-09-14 23:30:21 +02:00
Simone Bordet
8c9f097666
jetty-9 - Throwing EofException when trying to flush after output shutdown.
...
When the output is shutdown, field _cannotAcceptMoreAppDataToFlush is set to true,
indicating that no more flush() calls are accepted.
However, a further call to flush() was reading _cannotAcceptMoreAppDataToFlush and
just returning false, leaving writes in pending state but without chance to be completed.
Now, if we detect _cannotAcceptMoreAppDataToFlush==true in flush(), we check
whether the output was shutdown; if it is the case, we throw an EofException to signal
to the application that it cannot write because the connection is already closed.
2012-09-14 15:20:10 +02:00
Simone Bordet
655a313fdf
jetty-9 - Improved logging.
2012-09-14 15:09:22 +02:00
Greg Wilkins
22ba57b8d2
jetty-9 refactored onOpen and onClose
2012-09-14 17:38:47 +10:00
Simone Bordet
b264f20dc9
jetty-9 - Removed the write of an empty buffer from onOpen().
...
SslConnection should remain as passive as possible, with the next connection driving the activity.
If client connections need to drive the SSL handshake with an empty write, they should do it, and
not SslConnection.
2012-09-14 00:38:25 +02:00
Simone Bordet
24cbb6385b
jetty-9 - Just returning in case we want to fail an already failed write flusher.
2012-09-14 00:38:25 +02:00
Joakim Erdfelt
12470a2715
Introduce SocketBased, and squelching logging on tests
2012-09-13 08:51:45 -07:00
Jan Bartel
944b23240e
388706 Avoid unnecessary indirection through Charset.name
2012-09-13 17:03:10 +10:00
Greg Wilkins
c709981aa5
jetty-9 finished refactor for oneconnector and configuration pluggability
2012-09-13 10:00:44 +10:00
Greg Wilkins
a41b6e32ac
Merge branch 'jetty-9-configuration' into jetty-9
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
2012-09-13 08:22:06 +10:00
Greg Wilkins
b3e8f91026
jetty-9 flush returns boolean to say completely flushed or not
2012-09-13 08:11:05 +10:00
Greg Wilkins
79caf45604
Merge branch 'jetty-9' into jetty-9-configuration
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
2012-09-12 23:11:12 +10:00
Greg Wilkins
427a01855c
jetty-9 WriteFlusher handlers buffering endpoints
2012-09-12 23:06:19 +10:00
Joakim Erdfelt
550f0d28f6
attempting to address the SCEPSslTest.testWriteBlocked() failures
2012-09-10 15:15:31 -07:00
Greg Wilkins
26f5ffc459
jetty-9 improve SslConnection toString
2012-09-11 08:04:33 +10:00
Jesse McConnell
a8994178f5
[maven-release-plugin] prepare for next development iteration
2012-09-10 14:18:11 -05:00
Jesse McConnell
92180a9700
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
2012-09-10 14:18:01 -05:00
Jesse McConnell
10e4027579
[maven-release-plugin] prepare for next development iteration
2012-09-10 13:59:34 -05:00
Jesse McConnell
57a6258f96
[maven-release-plugin] prepare release jetty-8.1.7.v20120910
2012-09-10 13:59:10 -05:00
Jesse McConnell
1ec8b2621b
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
2012-09-10 13:47:05 -05:00
Jesse McConnell
4180d7e1f5
prepare for release
2012-09-10 12:59:04 -05:00
Greg Wilkins
73ebe89019
jetty-9 refactored configuration
2012-09-10 20:26:14 +10:00
Greg Wilkins
a15d71932f
jetty-9 protection from double onFillable calls
2012-09-09 08:31:31 +10:00
Greg Wilkins
2bb425d0b2
jetty-9 improved buffer recycling
2012-09-09 07:42:03 +10:00
Simone Bordet
236df8e94b
Jetty9 - Fixed compilation issues.
2012-09-06 09:37:11 +02:00
Simone Bordet
7231c82b69
Merged branch 'jetty-9' into jetty-9-client.
2012-09-06 08:41:48 +02:00
Simone Bordet
2715f64441
Jetty9 - Fourth take at HTTP client implementation.
2012-09-05 13:33:38 +02:00
Simone Bordet
b18ab0e76a
Jetty9 - First take at HTTP client implementation.
2012-09-04 19:20:29 +02:00
Jesse McConnell
d37deeea74
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:18 -05:00
Jesse McConnell
b418b0dd57
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:16 -05:00
Jesse McConnell
41e9b1f6e2
[maven-release-plugin] prepare release jetty-7.6.6.v20120903
2012-09-03 13:33:10 -05:00
Jesse McConnell
6c0b0af2fe
[maven-release-plugin] prepare release jetty-8.1.6.v20120903
2012-09-03 13:33:08 -05:00
Greg Wilkins
c3776764f4
jetty-9 ConcurrentScheduler refinements
2012-09-03 15:24:36 +10:00
Greg Wilkins
83dbca6553
jetty-9 reworked the schedulers
2012-08-31 13:22:58 +10:00
Greg Wilkins
8c6ad12088
jetty-9 fixed ArrayByteBufferPool and added test
2012-08-31 08:05:09 +10:00
Thomas Becker
8fbe6c59d5
jetty-9 merge
2012-08-29 17:27:26 +02:00
Simone Bordet
d84eee0b46
Jetty9 - Reverted AbstractConnector to use MappedByteBufferPool, as ArrayByteBufferPool is leaking buffers.
2012-08-28 18:14:22 +02:00
Simone Bordet
7a2b53d987
Jetty9 - Dispatching the onConnect(Session) callback in a different thread.
...
This is needed for two reasons: the first is that onOpen() is called from the selector thread
and onConnect() may perform I/O (such as sending a SETTINGS frame), and second
because onOpen() may be called when NPN upgrades the connection.
In the latter case, SslConnection is busy with the SSL handshake (for example is filling)
and calling onConnect() triggers a write, that ends up in the SslConnection that sees that
it is still in the SSL handshake and needs to fill, resulting in a reentrant fill, which is not
supported correctly by SslConnection.
Dispatching to a new thread makes the call safe, since SslConnection is properly synchronized.
2012-08-28 15:20:14 +02:00
Simone Bordet
2339da7cc0
Jetty9 - Marked tests as @Slow.
2012-08-28 13:04:18 +02:00
Simone Bordet
5aa3702606
Jetty9 - Better logging.
2012-08-28 11:56:37 +02:00
Simone Bordet
6601b65162
Jetty9 - Made the test more reliable and marked it as slow.
2012-08-28 11:56:22 +02:00
Simone Bordet
7a1faf3c08
Jetty9 - Start counting for idleness when we register read interest.
...
Otherwise it was possible that the endPoint was created, upon creation
it started counting for idleness, after a while read interested was set
and the endPoint idle timed out before having the chance to read.
2012-08-28 11:55:01 +02:00
Simone Bordet
a935c26764
Jetty9 - Fixed typo.
2012-08-27 16:32:01 +02:00
Greg Wilkins
cb5dd493fb
jetty-9 merged jetty-9-aggregation
2012-08-27 10:24:34 +10:00
Greg Wilkins
1d654a08cf
jetty-9 restructured graceful shutdown
2012-08-24 20:16:23 +10:00
Simone Bordet
06b2de17d5
Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http
2012-08-24 11:52:29 +02:00
Greg Wilkins
c707ba11d1
jetty-9 improved SSL shutdown input
2012-08-24 17:56:22 +10:00
Greg Wilkins
fac03a306b
jetty-9 more server test fixes
2012-08-24 16:53:36 +10:00
Greg Wilkins
cd719bf979
jetty-9 cleanups and fixes after refactor
2012-08-23 14:07:10 +10:00
Greg Wilkins
325bfc290d
jetty-9 work in progress on moving aggregation out of HttpChannel
2012-08-20 20:43:10 +10:00
Jesse McConnell
6ffaa478c4
standardize license headers
2012-08-17 16:09:49 -05:00
Joakim Erdfelt
3d1d76d214
Merge from jetty-8 to jetty-9 (license header standarization)
2012-08-17 13:44:22 -07:00
Jesse McConnell
5de0cee1eb
merge from master + license block standardization
2012-08-17 14:50:43 -05:00
Greg Wilkins
2a66567a5b
jetty-9 improved handling of half close
2012-08-17 15:34:53 +10:00
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