1173 Commits

Author SHA1 Message Date
Greg Wilkins
852be79a3c Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2013-11-01 14:45:16 +11:00
Greg Wilkins
a76ddc1c6a 420572 IOTest explicitly uses 127.0.0.1 2013-11-01 12:17:30 +11:00
Simone Bordet
edcb39cc89 Catching Throwable and closing channels rigorously. 2013-10-29 10:03:31 +01:00
Simone Bordet
00867b094b Making classes implement Closeable, rather than AutoCloseable,
since it is more semantically correct.
2013-10-29 10:03:31 +01:00
Simone Bordet
c822ee4f82 Make sure we never exit the selector loop unless stopped. 2013-10-28 12:19:16 +01:00
Greg Wilkins
c44537fca8 419899 Do not wrap SSL Exception as EoFException 2013-10-21 16:29:20 +11:00
Greg Wilkins
f3b393aa5d Refactored complexity out of HttpFields
In preparation of merging Fields class and supporting HTTP/2.0 HPACK
2013-10-17 21:35:11 +11:00
Greg Wilkins
27a3ceeb27 Optimised SelectorManager to avoid changeQ for interest ops 2013-10-17 12:43:28 +11:00
Simone Bordet
879c3eb6f5 Improved code in case of connection failures: close the connection,
and cancel the connect timeout task.
2013-10-16 17:24:43 +02:00
Simone Bordet
8bd6ab0beb Removed class SocketBased, not necessary. 2013-10-16 16:36:23 +02:00
Simone Bordet
114a95234b Merged branch 'master' into 'jetty-9.1'. 2013-10-16 16:30:04 +02:00
Simone Bordet
45828ee906 418892 - SSL session caching so unreliable it effectively does not
work.

Fixed by making sure that we completely decrypt read bytes.

Before the fix, it was possible that we returned after the decryption
of one TLS frame, while another was still present in the
_encryptedBuffer.
This lead to non-clean closes of the connection, which hampered the
capability of session reuse by clients.

Now we decrypt in a loop and only return if there is nothing more
that we can decrypt.
2013-10-16 16:27:36 +02:00
Simone Bordet
25d9b8704f 417356 - Add SOCKS support to jetty client.
Big refactoring to allow for additional proxy schemes that work at a
lower level than HTTP.

Introduced client-side ConnectionFactory, and binding that to a
HttpDestination, so that connections to that destination will use the
same ConnectionFactory.

The destination's ConnectionFactory is now initialized from the proxy
configuration and the transport, which is now itself a
ConnectionFactory.

The proxy configuration has also changed becoming polymorphic by
introducing a new ProxyConfiguration.Proxy abstract class,
which is implemented as HTTPProxy and can be implemented in future as
SOCKS4Proxy (and possibly others).
2013-10-08 15:06:39 +02:00
Jesse McConnell
856a24b65a [maven-release-plugin] prepare for next development iteration 2013-09-30 14:46:09 -05:00
Jesse McConnell
f466f03c6a [maven-release-plugin] prepare release jetty-9.0.6.v20130930 2013-09-30 14:46:00 -05:00
Jesse McConnell
0b3f431d27 set version back to 9.0.6-SNAPSHOT 2013-09-30 12:33:06 -05:00
Jesse McConnell
af2e6ff911 Merge branch 'master' into release-9 2013-09-30 12:28:04 -05:00
Greg Wilkins
6146f0cc9c cleanup threadpool usage 2013-09-30 14:07:17 +10:00
Greg Wilkins
5f02620603 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
2013-09-30 13:20:13 +10:00
Greg Wilkins
f07722909f reduced routine exception verbosity 2013-09-30 12:45:16 +10:00
Greg Wilkins
643b6c3c77 removed ExecutorCallback 2013-09-26 18:06:10 +10:00
Jesse McConnell
0525498ad3 [maven-release-plugin] prepare for next development iteration 2013-09-19 15:06:31 -05:00
Jesse McConnell
c05a725db6 [maven-release-plugin] prepare release jetty-9.0.6.v20130919 2013-09-19 15:06:17 -05:00
Simone Bordet
4663fa4992 Renamed "Empty" inner classes to "Adapter" to comply with the rest of
the codebase.
2013-09-04 13:15:23 +02:00
Greg Wilkins
2e444d2f17 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
	jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
2013-09-02 17:00:07 +10:00
Greg Wilkins
07ae3615ed 416321 handle failure during blocked committing write 2013-09-02 14:44:23 +10:00
Simone Bordet
ddca8bc327 Avoid StackOverflowErrors when submitting changes.
These were possible on a busy server, when many new connections are
created, and each triggers read interest: one connection submits the
read interest change, then runs the changes, finds that another
connections is created, runs it, which schedule a read interest
change, and so on.

Now the code is simpler, and while we always offer to the queue,
it may even be faster.
2013-08-29 20:04:01 +02:00
Simone Bordet
4923252ce4 Changed defaults for ArrayByteBufferPool.
There are cases, for example in WebSocket, where we want to allocate
small buffers to write frame headers and then do a gathered write.
ArrayByteBufferPool had a minimum size of 64 bytes,
which was too big and always led to allocation rather than pooling,
leading to performance slowdowns.

Defaults are now minSize=0, increment=1024.
2013-08-23 15:56:44 +02:00
Simone Bordet
72c4dbc46e 415062 SelectorManager wakeup optimisation.
Fixed race condition that could have allowed changes in queue but
selector waiting in select().
2013-08-23 14:12:11 +02:00
Greg Wilkins
c27020740f 415062 SelectorManager wakeup optimisation 2013-08-23 11:01:54 +10:00
Joakim Erdfelt
3c28bf8c60 Revert "415062 SelectorManager wakeup optimisation"
This reverts commit edbf6e07aabb1bae2180cb3f8640482392526fe2.
2013-08-16 14:38:10 -07:00
Joakim Erdfelt
fd3537e012 Revert "415062 SelectorManager wakeup optimisation"
This reverts commit 2f0becff8fbb95d8eee6d0d0cbfc739c7795dd01.
2013-08-16 14:38:08 -07:00
Joakim Erdfelt
d351c82de8 Revert "415062 SelectorManager wakeup optimisation"
This reverts commit b58c05d77ccdee924cd9723cd307bab5e9135526.
2013-08-16 14:38:02 -07:00
Greg Wilkins
b58c05d77c 415062 SelectorManager wakeup optimisation
Some further cleanup after sbordet review
2013-08-17 00:01:20 +10:00
Greg Wilkins
2f0becff8f 415062 SelectorManager wakeup optimisation
removed wakeup spin
2013-08-16 19:23:59 +10:00
Greg Wilkins
edbf6e07aa 415062 SelectorManager wakeup optimisation 2013-08-16 16:35:38 +10:00
Thomas Becker
38549f20cd FillInterest fix javadoc 2013-08-15 12:13:44 +02:00
Jan Bartel
c80100b4a9 [maven-release-plugin] prepare for next development iteration 2013-08-15 19:13:27 +10:00
Jan Bartel
e7e7e45500 [maven-release-plugin] prepare release jetty-9.0.5.v20130815 2013-08-15 19:13:13 +10:00
Jan Bartel
716430bb03 [maven-release-plugin] rollback the release of jetty-9.0.5.v20130815 2013-08-15 18:03:49 +10:00
Jan Bartel
3d13c15d35 [maven-release-plugin] prepare release jetty-9.0.5.v20130815 2013-08-15 17:22:03 +10:00
Jan Bartel
7947b35134 Reset version for rerun of 9.0.5 2013-08-15 16:47:03 +10:00
Joakim Erdfelt
5dbd746047 Fixing malformed Javadoc warnings in jetty-io 2013-08-14 12:46:25 -07:00
Simone Bordet
34032552ea Avoid boxing of primitive int variables in logging statements. 2013-08-14 14:33:05 +02:00
Jesse McConnell
4383c9042d [maven-release-plugin] prepare for next development iteration 2013-08-13 14:20:56 -05:00
Jesse McConnell
160d34ec23 [maven-release-plugin] prepare release jetty-9.0.5.v20130813 2013-08-13 14:20:47 -05:00
Greg Wilkins
b8f7637e7d Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-07-22 23:32:04 +10:00
Thomas Becker
8946b4946b SSLConnection comment out setting soLonger timeout to avoid threads stuck in preClose0 2013-07-22 11:52:13 +02:00
Greg Wilkins
3add75f135 398467 Servlet 3.1 Non Blocking IO
prevent fillInterest from HTTP after upgrade
2013-07-12 13:01:46 +10:00
Greg Wilkins
93faa8147b 398467 Servlet 3.1 Non Blocking IO
use nested classes for better stack trace
2013-07-11 19:13:58 +10:00