Commit Graph

1481 Commits

Author SHA1 Message Date
Simone Bordet e01636d109 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-02-07 22:31:06 +01:00
Simone Bordet c0d261d7aa Removed duplicated logging. 2017-02-07 22:23:52 +01:00
Jesse McConnell bba4a8bbf6 Merge remote-tracking branch 'origin/release-9.4.1' into jetty-9.4.x 2017-01-26 11:22:08 -06:00
Jesse McConnell 635355c6e7 Merge remote-tracking branch 'origin/release-9.3.16' into jetty-9.3.x 2017-01-26 11:07:27 -06:00
Simone Bordet 9b7bde499a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-23 21:46:11 +01:00
Simone Bordet b4fb6a74c7 Fixes #1282 - ByteArrayEndPointTest.testIdle() failure.
Reworked the waits in the test to avoid idle timeout checks happening
about at the same time as test operations.
2017-01-23 21:44:32 +01:00
Jesse McConnell d0c33ebe8b Updating to version 9.4.2-SNAPSHOT 2017-01-20 10:49:06 -06:00
Jesse McConnell 556ecbcdcf Updating to version 9.4.1.v20170120 2017-01-20 09:47:53 -06:00
Jesse McConnell 66b43ecda8 Updating to version 9.3.17-SNAPSHOT 2017-01-20 09:33:43 -06:00
Jesse McConnell df03355d00 Updating to version 9.3.16.v20170120 2017-01-20 09:06:48 -06:00
Simone Bordet 0c8273f2ca Happy New Year 2017. 2017-01-19 19:26:41 +01:00
Simone Bordet 07838b057f Happy New Year 2017. 2017-01-19 18:54:03 +01:00
Simone Bordet 347c48d657 Revert "resolve merge and update license headers"
This reverts commit 53b31b03dd, reversing
changes made to 4565c186d7.
2017-01-19 18:26:43 +01:00
Jesse McConnell 53b31b03dd resolve merge and update license headers 2017-01-19 09:33:16 -06:00
Jesse McConnell ce3e6dafec update license headers to 2017 2017-01-19 09:30:00 -06:00
Simone Bordet 6222ccba14 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-18 17:28:18 +01:00
Simone Bordet f97396b131 Fixes #1275 - Get rid of Mockito.
Converted the 2 tests that were using Mockito and removed from the POMs.
2017-01-18 17:09:57 +01:00
Simone Bordet 66efbe5bac Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-16 19:24:16 +01:00
Simone Bordet 3b49239407 Renamed class to clarify behavior. 2017-01-16 19:21:52 +01:00
Simone Bordet 3883b8cbb5 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-16 19:20:24 +01:00
Simone Bordet ddc63066fc Fixes #1259 - HostnameVerificationTest.simpleGetWithHostnameVerificationEnabledTest is broken.
When a fill() triggered by a flush() throws, now the write flusher is
failed rather than completed.
This ensures that both the read and the write side see the same
exception, rather than the write side seeing a ClosedChannelException.
2017-01-16 19:05:09 +01:00
Simone Bordet e539d0b1fd Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-12 17:52:45 +01:00
Simone Bordet 11d669092a Issue #1073 - JDK9 support in Jetty 9.3.x.
* Updated Maven plugins to versions that support JDK 9.
* Added jdk9 profiles to the build files.
* Introduced modules jetty-alpn-java-client and jetty-alpn-java-server
containing a pure JDK 9 implementation of ALPN.
* Wired ALPN connection factories (client and server) to use the proper
ALPN implementation based on the JDK platform version (8 or 9).
2017-01-12 15:41:02 +01:00
Greg Wilkins 1d0d601694 Issue #1242 Added a quiet exception 2017-01-12 09:25:54 +11:00
Simone Bordet d0930e1b9a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-10 15:06:45 +01:00
Simone Bordet b8986d5812 Fixes #1228 - Internal error during SSL handshake.
Added a guard to avoid unwrapping during handshake if SSLEngine is
already closed.
2017-01-10 15:05:40 +01:00
Joakim Erdfelt 7494914ff6 Updating to version 9.3.16-SNAPSHOT 2016-12-20 13:09:32 -07:00
Joakim Erdfelt 680ecd646b Updating to version 9.3.15.v20161220 2016-12-20 12:31:58 -07:00
Simone Bordet df986acaeb Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-12-20 11:55:15 +01:00
Simone Bordet 753aa5ca37 Issue #1146 - jetty.server.HttpInput deadlock.
Moved calls to close(Throwable) outside synchronized blocks, since
they mail fail callbacks that reenter into caller code, causing
deadlocks.
2016-12-20 11:40:27 +01:00
Simone Bordet 3b73265331 Code cleanups. 2016-12-20 11:40:27 +01:00
Joakim Erdfelt 6b3b59df43 Updating to version 9.2.21-SNAPSHOT 2016-12-16 16:23:06 -07:00
Joakim Erdfelt bcbcee7f23 Updating to version 9.2.20.v20161216 2016-12-16 15:47:41 -07:00
Joakim Erdfelt 44596a7714 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-12-16 08:38:01 -07:00
Simone Bordet 91eb6a2405 Removed usage of special empty buffers, not needed. 2016-12-16 11:19:18 +01:00
Simone Bordet 8864361c1a Fixes #1181 - Review buffer underflow cases in SslConnection. 2016-12-16 10:40:06 +01:00
Jesse McConnell 6a7e5dd4f5 Updating to version 9.4.1-SNAPSHOT 2016-12-08 09:41:50 -06:00
Jesse McConnell c54efb5929 Updating to version 9.4.0.v20161208 2016-12-08 08:56:45 -06:00
Jesse McConnell 19333b8b3b Merge branch 'jetty-9.4.x' into release-9.4.0 2016-12-08 08:50:15 -06:00
Greg Wilkins 5186c1e6d0 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-12-08 18:35:40 +11:00
Jesse McConnell f8338b3f59 Updating to version 9.4.1-SNAPSHOT 2016-12-07 10:32:41 -06:00
Jesse McConnell dac1d17a2d Updating to version 9.4.0.v20161207 2016-12-07 09:47:30 -06:00
Greg Wilkins af5d27c2f7 Issue #1146 DecryptedEndPoint deadlock 2016-12-07 22:50:27 +11:00
Joakim Erdfelt e5fb1558a8 toConnectionString() can handle null connection 2016-12-01 13:06:50 -07:00
Greg Wilkins 2ef23a6725 Issue #572
Improved to the toString and dump output of connections, endpoints and channel to assist with debugging
made the SSL callbacks and runnables Invocable to avoid thread starvation.
2016-11-23 16:58:35 +11:00
Greg Wilkins fe1704c89a javadoc 2016-11-10 13:56:33 +11:00
Greg Wilkins 1eb4e3b4e3 Issue #1062 Ssl Thread Starvation 2016-11-10 10:17:46 +11:00
Greg Wilkins a6ce2d7821 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-10 10:08:00 +11:00
Greg Wilkins 3b36b13d31 Issue #1062 Ssl Nonblocking read callback 2016-11-10 09:57:15 +11:00
Simone Bordet ca3af68809 Code cleanup.
Clarified with comments how the 2 execution strategies work in ManagedSelector.

Fixed computation of the minimum number of threads in Server.
2016-11-03 11:44:49 +01:00