Commit Graph

27229 Commits

Author SHA1 Message Date
Joakim Erdfelt 43937b1987
Issue #8886 - changes to method names + abstract url impl 2022-11-14 13:08:50 -06:00
Simone Bordet bc3aa21b92
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-14 16:11:52 +01:00
Simone Bordet 6571eb538b
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-14 15:26:34 +01:00
Simone Bordet df265e0abb
Fixes #8678 - Jetty client receives GO_AWAY and continue to send traffic on same connection (#8891)
* Fixes #8678 - Jetty client receives GO_AWAY and continue to send traffic on same connection

* Now upon receiving the GOAWAY, the connection is removed from the pool, so it cannot be used by new requests.
* HTTP2Session.removeStream() now happens _after_ notifying HEADERS and DATA events, although the Stream state change still happens before.
This is necessary to avoid that a "close" event is notified before a "headers" or "data" event.

With these changes, the race window of a client acquiring a connection while the server is closing it is reduced, but it is impossible to close it completely.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-14 15:25:25 +01:00
Simone Bordet d485d1e9ba
Fixed merge of #8882 by removing deprecated constructor, updating parameter order and removing unused classes.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-14 12:03:12 +01:00
Lachlan Roberts eff404cf7d Re-enable and fix StatisticsServletTest for ee9
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-14 09:37:26 +11:00
Olivier Lamy d207ee9660
use modify-sources-plugin release version 1.0.2 (#8890) 2022-11-12 16:32:23 +10:00
Greg Wilkins a812b86663 Fix test for #8887
Don't demand at EOF
2022-11-12 08:46:55 +11:00
Joakim Erdfelt ee097316bb
Issue #8886 - support extensible Resource URI schemes 2022-11-11 10:10:53 -06:00
Joakim Erdfelt 1fec356118
Cleanup and organization of GzipHandlerTest.
Names of test methods cleaned up.
Duplicate tests removed.
Assertions standardized.
2022-11-11 09:33:39 -06:00
Greg Wilkins 681e04d68a Temporary disable test that hangs forever. 2022-11-11 16:36:58 +11:00
Lachlan Roberts 905568a93d fix to ResourceHandler for ResourceHandlerTest.testDirectoryOfCollections
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-11 15:01:22 +11:00
Joakim Erdfelt cf0c4a2b07
Move GzipDefaultServletTest to jetty-core/jetty-server tests 2022-11-10 15:25:22 -06:00
Joakim Erdfelt 9640d0470a
Fix compilation 2022-11-10 14:31:09 -06:00
Joakim Erdfelt d7cc13d972
Merge branch 'jetty-12-more-test-tags' into jetty-12.0.x 2022-11-10 13:24:27 -06:00
Joakim Erdfelt c9b621da84
More flaky tags 2022-11-10 11:57:38 -06:00
Joakim Erdfelt 704442b670
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-11-10 11:55:28 -06:00
Joakim Erdfelt 6bd0a7a60b
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-10 11:54:59 -06:00
Simone Bordet 12041da72f
Fixes #8810 - ArrayRetainableByteBufferPool inefficiently calculates bucket indices (#8882)
Added constructor that uses IntUnaryOperator to avoid boxing.
Deprecated constructor that uses Function<Integer, Integer>.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-10 18:42:53 +01:00
Joakim Erdfelt 34e38d2156
Issue #8822 - Fix NPE seen on `deflater.reset()` when called after `deflater.end()` (#8881)
* Issue #8822 - NPE on deflater.reset() called after deflater.end()

Now waiting for the server to finish writing even in case of HEAD method,
otherwise the test exit races with the server finishing to fake-write the response content.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-10 18:42:11 +01:00
Joakim Erdfelt a636a7d153
Adding some more test tags 2022-11-10 10:14:58 -06:00
Simone Bordet 051588d45b
Fixed javadoc typo.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-10 16:21:24 +01:00
Lachlan Roberts 126658145c remove setter for HttpContentFactory on ResourceHandler
revert to using computeIfAbsent on CachingHttpContentFactory
make direct buffers configurable on CachingHttpContentFactory

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-11 00:49:55 +11:00
Lachlan Roberts bff3c83726 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-11-10 17:38:46 +11:00
Lachlan Roberts 539777492e Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-10 17:20:21 +11:00
Lachlan 690220fc40
Merge pull request #8787 from eclipse/jetty-10.0.x-8786-KeyStoreScanner-Symlink
Issue #8786 - add configuration for KeyStoreScanner to not resolve aliases
2022-11-10 17:17:59 +11:00
Lachlan Roberts 3c9b912dc6 Issue #8330 - port openid changes to ee10
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-10 17:07:11 +11:00
Lachlan Roberts 7cccd9629f Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-11-10 17:05:00 +11:00
Lachlan Roberts 27670be944 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-10 16:54:16 +11:00
Lachlan 4f633e945c
Merge pull request #8792 from eclipse/jetty-10.0.x-OpenIdSessionSerialization
Issue #8330 - fix IllegalStateException from using OpenID with SessionDatastore
2022-11-10 16:54:03 +11:00
Lachlan Roberts eeb4df9965 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-HttpContent-Caching-Refactor 2022-11-10 16:20:30 +11:00
Lachlan Roberts 1c6d36e44a changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-10 16:16:51 +11:00
Lachlan Roberts 24ce284e04 add return to BufferUtil.readFrom javadoc
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-10 10:43:58 +11:00
Lachlan Roberts 387d380f75 fixes to the CachingHttpContentFactory caching algorithm
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-10 10:42:58 +11:00
Joakim Erdfelt 27abda6299
Issue #8877 - disabling hazelcast testing until k8s issue can be solved (in a branch) 2022-11-09 11:59:16 -06:00
Joakim Erdfelt a34e45a09e
Issue #8877 - disabling hazelcast testing until k8s issue can be solved (in a branch) 2022-11-09 11:58:46 -06:00
Joakim Erdfelt 08c47f5f57
Jetty 12 - use JVM provided null OutputStream (#8789)
* Remove IO.getNull* methods and use JVM versions

+ This also honors the open/close/error on
  bad use of the streams/writers
2022-11-09 07:06:43 -06:00
Simone Bordet e2e4d256e7
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-09 12:23:27 +01:00
Simone Bordet 40e79c88ab
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-09 12:17:44 +01:00
Simone Bordet c280e31b46
Fixes #7117 - Timeout with Expect 100 continue when using ProxyServlet. (#8873)
* Fixes #7117 - Timeout with Expect 100 continue when using ProxyServlet.

Now getReader() tests whether it has to send a 100 continue in case getInputStream() 
is not called because the reader is reused.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-09 12:16:42 +01:00
Simone Bordet 0e3f3ac316
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-09 12:14:29 +01:00
Simone Bordet 3b65cd32c9
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-09 12:13:55 +01:00
Simone Bordet f21fa6e6e9
Fixed flakyness of GracefulShutdownTest by explicitly setting the Connector shutdownIdleTimeout to a large value that does not interfere with the tests.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-09 12:13:27 +01:00
Lachlan Roberts 3d96b4b7d0 fix javadoc
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-09 14:52:17 +11:00
Lachlan Roberts 890d02568c use double checked locking for FileMappedHttpContent
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-09 14:43:42 +11:00
Lachlan Roberts 5fec1801f5 add getters and setters for HttpContentFactory onto ResourceHandler
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-09 14:20:52 +11:00
Lachlan Roberts a4e773a7ab changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-09 14:10:49 +11:00
Joakim Erdfelt aa9df2a402
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-11-08 18:16:45 -06:00
Joakim Erdfelt 3ffc29f669
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-08 18:09:01 -06:00
Joakim Erdfelt 793bee9e14
Issue #8716 - Handle bad host/authority headers better (#8717)
* Issue #8716 - Handle bad host/authority headers better
* Remove extra `Host` header in testcase that doesn't deal with bad Host headers
* Create URIUtil.isRegName
* Correcting HostPortTest.testValidAuthority
* Correcting RequestTest.testInvalidHostHeader
* Remove clonable, set to final

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-08 18:08:20 -06:00