4054 Commits

Author SHA1 Message Date
Simone Bordet
eceaff7bed Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2018-07-18 16:21:00 +02:00
Simone Bordet
37e4da24cb Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2018-07-18 16:15:27 +02:00
Greg Wilkins
17b6eee5ac
Jetty 9.4.x 2233 ssl flush try again 2 (#2726)
Major refactor of SslConnection to address #2233 and to simplify in preparation for java-11 support.

Made the `needFillInterest` and `onIncompleteFlush` methods the primary stateful methods with state for fill and flush side that does not reproduce state already held by the SslEngine itself.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-07-18 10:11:35 +02:00
Lachlan Roberts
6de77d26e2 Issue #2706 - Resource Service Incorrectly Returning 404
Flush response buffer in places where the response needs to be committed.
Removed if statement preventing HEAD requests processing conditional headers.
Added two new test cases which failed before the changes and should now pass.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-07-18 11:27:19 +10:00
Simone Bordet
cc1071fa05 Fixes #2717 - Async requests are not considered when shutting down gracefully.
Now using _requestStats instead of _dispatchedStats to check for
requests completed when shutting down StatisticsHandler.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-07-16 10:54:43 +02:00
Joakim Erdfelt
0b69f00665 Updating to version 9.4.12-SNAPSHOT 2018-07-11 17:32:16 -05:00
Joakim Erdfelt
260596dd10 Updating to version 9.4.12.RC0 2018-07-11 16:30:55 -05:00
lachan-roberts
e05c11ae30 Changing default Http headerCacheSize from 512 to 4096
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2018-07-10 10:39:45 +10:00
Venkata Jaswanth
9d9189d476 check for session id in path if url tracking mode is enabled (#2668)
Signed-off-by: Venkata Jaswanth U <aj.jaswanth@gmail.com>
2018-07-04 10:37:08 +02:00
Greg Wilkins
93a8afcc6b Fixed #2677 use decoded path for favicon.ico
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-06-21 11:55:16 +02:00
Greg Wilkins
4f54447585
Jetty 9.4.x 2501 accept listener (#2511)
* Issue #2501 - Accept Listener
* Issue #2501 - Include accepting connections in connection limit.
* AcceptRateLimit minimal delay

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-06-19 09:03:54 +02:00
Matthias Perktold
09f614b48e Eliminated redundant invocations of HandlerCollection.getHandlers()
Signed-off-by: Matthias Perktold <tias251@gmail.com>
2018-06-18 19:19:07 +02:00
Simone Bordet
253c637742
Fixes #2663 - Guard Throwable.addSuppressed() calls. (#2665)
* Fixes #2663 - Guard Throwable.addSuppressed() calls.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-14 15:21:44 +02:00
Joakim Erdfelt
1adbceae97
Merge pull request #2652 from lachlan-roberts/jetty-9.4.x-2398-MultiPartFormInputStream-Charset-Documentation
Issue #2398 - MultiPart Charset Encoding
2018-06-13 16:57:28 -05:00
Greg Wilkins
346879f2a5
Merge pull request #2664 from mperktold/jetty-9.4.x
Issue #2662 Unnecessary boxing conversions
2018-06-13 22:52:27 +02:00
Matthias Perktold
f901efc413 Issue #2662 - Unnecessary boxing conversions
Signed-off-by: Matthias Perktold <tias251@gmail.com>
2018-06-13 16:20:12 +02:00
Lachlan Roberts
34351c7854 Issue #2398 - MultiPart Charset Encoding
Improved comment describing charset behaviour for MultiPart

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-06-12 17:31:04 +10:00
Simone Bordet
4f1dd352d6
Issue #2468 - Remove SoLinger. (#2644)
* Issue #2468 - Remove SoLinger.

For non-blocking sockets, StandardSocketOptions#SO_LINGER javadocs
report that the behavior is undefined. In JDK 11 setting SoLinger
for non-blocking sockets will be ignored.

As such, there is no point in allowing SoLinger to be configured
in Jetty that only uses non-blocking sockets.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-09 13:21:24 +02:00
Joakim Erdfelt
3932b11e64 Merge remote-tracking branch 'origin/release-9.4.11' into jetty-9.4.x 2018-06-07 14:31:24 -05:00
Joakim Erdfelt
0e6c91b604 Updating to version 9.2.26-SNAPSHOT 2018-06-06 18:54:58 -05:00
Joakim Erdfelt
4830fd15e9 Updating to version 9.2.25.v20180606 2018-06-06 16:42:54 -05:00
Joakim Erdfelt
f54629a3c4
Merge pull request #2629 from eclipse/jetty-9.2.x-issue-2135-android-direct-buffers
Issue #2135 - proposal for Android 8.1 with SSL and direct buffers
2018-06-06 16:27:43 -05:00
Joakim Erdfelt
2d5ef67d3f Issue #2135 - TLS on Android 8.1 workaround configuration for Direct ByteBuffer use
+ Changes from review with @sbordet

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-06 10:55:28 -05:00
Joakim Erdfelt
ea116028d4 Issue #2135 - TLS on Android 8.1 workaround configuration for Direct ByteBuffer use
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-06 10:44:53 -05:00
Simone Bordet
fddfa40e3d Issue #2626 - Test failure: ShutdownMonitorTest.testStartStopSamePortDifferentKey.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-06 09:53:46 +02:00
Greg Wilkins
1f1a5cb064
Merge pull request #2610 from lachlan-roberts/jetty-9.4.x-issue-2592-ServerTimeoutTest-testAsyncWriteIdleTimeoutFires
Issue #2592 - fix for ServerTimeoutTest.testAsyncWriteIdleTimeoutFires [HTTP] on windows
2018-06-06 08:24:07 +02:00
Lachlan Roberts
29c9afe135 Issue #2592 - Failing test on Windows: ServerTimeoutsTest.testAsyncWriteIdleTimeoutFires[transport: HTTP]
removed HttpOutput.close(Closeable) method as IO.close(Closeable) should be used instead
added isFailed() method to WriteFlusher and used it to fix WriteFlusherTest.testFailWhileBlocking()
surrounded usage of onError() in HttpOutput.run() with try-finally so that IO.close(this) is executed if onError throws

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-06-06 15:35:54 +10:00
Joakim Erdfelt
e4bfe00dce Updating to version 9.4.12-SNAPSHOT 2018-06-05 14:18:37 -05:00
Joakim Erdfelt
d5fc0523cf Updating to version 9.4.11.v20180605 2018-06-05 13:23:02 -05:00
Joakim Erdfelt
5eefa90e05 Updating to version 9.3.25-SNAPSHOT 2018-06-05 13:13:07 -05:00
Joakim Erdfelt
84205aa28f Updating to version 9.3.24.v20180605 2018-06-05 12:11:03 -05:00
Joakim Erdfelt
f0ff571c98 Reverting version to 9.3.24-SNAPSHOT 2018-06-05 12:06:58 -05:00
Joakim Erdfelt
13640c297c Bumping version to 9.3.25-SNAPSHOT 2018-06-05 11:58:37 -05:00
Lachlan Roberts
72dcfc15e5 Issue #2592 - Failing test on Windows: ServerTimeoutsTest.testAsyncWriteIdleTimeoutFires[transport: HTTP]
changed write flusher to go from pending state to failed state
reverted previous HttpOutput changes

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-06-05 19:21:30 +10:00
Simone Bordet
9524156d8a Issue #2602 - Failing test: ServerConnectorTimeoutTest.
Removed duplicate test.
Removed lines that were testing unreliable TCP behavior.
Fixed retrieval of EndPoint in case of SSL.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-01 18:13:25 +02:00
Simone Bordet
946e6682b7 Merged 'origin/jetty-9.4.x' into 'jetty-9.4.x'. 2018-06-01 16:43:24 +02:00
Simone Bordet
5baabd0ba8 Fixes #2237 - Test failure: SelectChannelServerSslTest.testFullURI.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-01 16:35:23 +02:00
Simone Bordet
af739ce85e Issue #2237 - Test failure: SelectChannelServerSslTest.testFullURI.
Cleanup of test classes.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-01 16:34:29 +02:00
Greg Wilkins
c3670d5870 Issue #2237 reduce large URI to avoid split write
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-06-01 16:30:07 +02:00
Joakim Erdfelt
53e8bc2a63 Backport of issue #2560 fixes to jetty-9.3.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-31 12:43:17 -05:00
Joakim Erdfelt
ad4dceb1c0 Issue #2560 - Moving InvalidPath logic from PathResource to ResourceContentFactory
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-31 11:31:36 -05:00
Lachlan Roberts
1bf5128e6d Fixes #2592 - changes to fix ServerTimeoutsTest.testAsyncWriteIdleTimeoutFires[transport: HTTP] on windows
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-05-31 19:44:51 +10:00
Greg Wilkins
2bcc528920 expand spruious tabs in java sources
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-29 10:40:09 +02:00
Lachlan Roberts
d13e79a284 Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-9.4.x-server-stackTraceRemoval 2018-05-26 00:35:02 +10:00
Greg Wilkins
e6e49bdc85 Updated javadoc for callbacks
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-25 08:01:31 +02:00
Lachlan Roberts
c829ee3210 Issue #2424 - ReadPendingException in testHttpWriteIdleTimeout()
Replacing setBlockingTimeout with setIdleTimeout to fix the ReadPendingException on ServerConnectorTimeoutTest.testHttpWriteIdleTimeout().

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-05-23 07:41:20 +10:00
Lachlan Roberts
0664893022 Issue #2542 - Log exception stackTraces instead of printing
replaces some usages of printStackTrace with logging in ConnectorTimeoutTest to avoid printing out the stack trace on passing tests

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-05-23 07:39:23 +10:00
Simone Bordet
462679910f Fixes #2544 - Test Failure: LowResourcesMonitorTest.testMaxLowResourceTime().
Rewrote the test to not write to the server,
thus avoiding connection resets.

The rewrite also clarified what the test was testing.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-05-22 12:55:03 +02:00
Simone Bordet
6b7f4c91db
Merge pull request #2552 from eclipse/jetty-9.4.x-2549-ConsumeAll
Issue #2549 ConsumeAll forced EOF or EarlyEOF
2018-05-18 09:18:57 +02:00
Greg Wilkins
c69ab6bd56 Issue #2549 ConsumeAll forced EOF or EarlyEOF
Cleanup after review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-18 16:39:44 +10:00